Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[karo-tx-linux.git] / arch / powerpc / boot / ebony.c

diff --git a/arch/powerpc/boot/ebony.c b/arch/powerpc/boot/ebony.c
index eaf0b9bb68d6acc84a285a6df8fec7686799f566..86c0f5df0a86358925d3d0b8c19b91c79a3fa5e5 100644 (file)
--- a/arch/powerpc/boot/ebony.c
+++ b/arch/powerpc/boot/ebony.c
@@ -26,11 +26,9 @@
 #include "reg.h"
 #include "io.h"
 #include "dcr.h"
+#include "4xx.h"
 #include "44x.h"
 
-extern char _dtb_start[];
-extern char _dtb_end[];
-
 static u8 *ebony_mac0, *ebony_mac1;
 
 /* Calculate 440GP clocks */
@@ -136,7 +134,7 @@ static void ebony_fixups(void)
        unsigned long sysclk = 33000000;
 
        ibm440gp_fixup_clocks(sysclk, 6 * 1843200);
-       ibm44x_fixup_memsize();
+       ibm4xx_fixup_memsize();
        dt_fixup_mac_addresses(ebony_mac0, ebony_mac1);
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
        ebony_flashsel_fixup();