Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 44x / canyonlands.c

diff --git a/arch/powerpc/platforms/44x/canyonlands.c b/arch/powerpc/platforms/44x/canyonlands.c
index dac5b32036963e07a90953bec20d49ba7c29edfd..3949289f51dfa7e1b90999e4669c780597020b5a 100644 (file)
--- a/arch/powerpc/platforms/44x/canyonlands.c
+++ b/arch/powerpc/platforms/44x/canyonlands.c
@@ -23,8 +23,7 @@
 #include <asm/time.h>
 #include <asm/uic.h>
 #include <asm/pci-bridge.h>
-
-#include "44x.h"
+#include <asm/ppc4xx.h>
 
 static __initdata struct of_device_id canyonlands_of_bus[] = {
        { .compatible = "ibm,plb4", },
@@ -59,6 +58,6 @@ define_machine(canyonlands) {
        .progress                       = udbg_progress,
        .init_IRQ                       = uic_init_tree,
        .get_irq                        = uic_get_irq,
-       .restart                        = ppc44x_reset_system,
+       .restart                        = ppc4xx_reset_system,
        .calibrate_decr                 = generic_calibrate_decr,
 };