Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'

[u-boot] / arch / powerpc / cpu / mpc512x / traps.c

diff --git a/arch/powerpc/cpu/mpc512x/traps.c b/arch/powerpc/cpu/mpc512x/traps.c
index 10169912b7f2e614e180d025aa61810c3664a62d..9f5bcd7fc3350a5fa9b1b44496b9cac0e921872e 100644 (file)
--- a/arch/powerpc/cpu/mpc512x/traps.c
+++ b/arch/powerpc/cpu/mpc512x/traps.c
@@ -27,7 +27,6 @@ extern unsigned long search_exception_table(unsigned long);
  * amount of memory on the system if we're unable to keep all
  * the memory mapped in.
  */
-extern ulong get_effective_memsize(void);
 #define END_OF_MEM (gd->bd->bi_memstart + get_effective_memsize())
 
 /*