Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / arch / powerpc / platforms / 44x / warp.c

diff --git a/arch/powerpc/platforms/44x/warp.c b/arch/powerpc/platforms/44x/warp.c
index 8f01563dbd2aa3d8aacb16a7629a961f6103ae97..39cf6150a72b2701af6eb62348ce364b3d88ce26 100644 (file)
--- a/arch/powerpc/platforms/44x/warp.c
+++ b/arch/powerpc/platforms/44x/warp.c
@@ -18,9 +18,7 @@
 #include <asm/udbg.h>
 #include <asm/time.h>
 #include <asm/uic.h>
-
-#include "44x.h"
-
+#include <asm/ppc4xx.h>
 
 static __initdata struct of_device_id warp_of_bus[] = {
        { .compatible = "ibm,plb4", },
@@ -49,7 +47,7 @@ define_machine(warp) {
        .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,
 };
 
@@ -137,7 +135,7 @@ static int __init pika_dtm_start(void)
        }
        of_node_put(np);
 
-       fpga = ioremap(res.start + 0x20, 4);
+       fpga = ioremap(res.start, 0x24);
        if (fpga == NULL)
                return -ENOENT;