common: arm: davinci: Move header file out of common

[people/ms/u-boot.git] / include / mpc8260.h

diff --git a/include/mpc8260.h b/include/mpc8260.h
index a8ae2787991fdbc84283b8488730cd70032ed43f..75f1b0c9df6d83fb2f0611ec2dd9fa1f11173391 100644 (file)
--- 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
@@ -896,7 +892,7 @@
 #define UPMC                   3
 
 #if !defined(__ASSEMBLY__) && defined(CONFIG_WATCHDOG)
-extern __inline__ void
+static __inline__ void
 reset_8260_watchdog(volatile immap_t *immr)
 {
     immr->im_siu_conf.sc_swsr = 0x556c;