Merge branch 'master' of git://git.denx.de/u-boot-samsung

[platform/kernel/u-boot.git] / arch / powerpc / include / asm / ppc.h

diff --git a/arch/powerpc/include/asm/ppc.h b/arch/powerpc/include/asm/ppc.h
index f5e9334..4d9af6c 100644 (file)
--- a/arch/powerpc/include/asm/ppc.h
+++ b/arch/powerpc/include/asm/ppc.h
@@ -13,11 +13,6 @@
 
 #ifndef __ASSEMBLY__
 
-#if defined(CONFIG_MPC5xxx)
-#include <mpc5xxx.h>
-#elif defined(CONFIG_MPC512X)
-#include <asm/immap_512x.h>
-#endif
 #ifdef CONFIG_MPC86xx
 #include <mpc86xx.h>
 #include <asm/immap_86xx.h>
@@ -43,9 +38,6 @@
 #include <asm/arch/immap_lsch2.h>
 #endif
 
-#if defined(CONFIG_MPC5xxx)
-uint get_svr(void);
-#endif
 uint get_pvr(void);
 uint get_svr(void);
 uint rd_ic_cst(void);
@@ -56,7 +48,6 @@ void wr_dc_cst(uint);
 void wr_dc_adr(uint);
 
 #if defined(CONFIG_4xx)        || \
-       defined(CONFIG_MPC5xxx) || \
        defined(CONFIG_MPC85xx) || \
        defined(CONFIG_MPC86xx) || \
        defined(CONFIG_MPC83xx)
@@ -85,10 +76,6 @@ void ddr_enable_ecc(unsigned int dram_size);
 #endif
 #endif
 
-#if defined(CONFIG_MPC5xxx)
-int    prt_mpc5xxx_clks(void);
-#endif
-
 #if defined(CONFIG_MPC85xx)
 typedef MPC85xx_SYS_INFO sys_info_t;
 void get_sys_info(sys_info_t *);