diff options
| author | Stefano Babic <[email protected]> | 2014-07-16 08:51:30 +0200 |
|---|---|---|
| committer | Stefano Babic <[email protected]> | 2014-07-16 08:51:30 +0200 |
| commit | dab5e3469d294a4e1ffed8407d296a78e02cc01f (patch) | |
| tree | c6378034591210b3142ca3add806d52c6ea22b3b /include/mpc8260.h | |
| parent | 14a1613140519a8d0a88e6054c302a8cb3e067a5 (diff) | |
| parent | 524123a70761110c5cf3ccc5f52f6d4da071b959 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <[email protected]>
Conflicts:
boards.cfg
Diffstat (limited to 'include/mpc8260.h')
| -rw-r--r-- | include/mpc8260.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/mpc8260.h b/include/mpc8260.h index a8ae2787991..9980c74b512 100644 --- a/include/mpc8260.h +++ b/include/mpc8260.h @@ -21,10 +21,6 @@ #if defined(CONFIG_MPC8272_FAMILY) #ifdef CONFIG_MPC8247 #define CPU_ID_STR "MPC8247" -#elif defined CONFIG_MPC8248 -#define CPU_ID_STR "MPC8248" -#elif defined CONFIG_MPC8271 -#define CPU_ID_STR "MPC8271" #else #define CPU_ID_STR "MPC8272" #endif |