Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / arm / mach-clps711x / fortunet.c

diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c
index c1c5b8e..ff26a85 100644 (file)
--- a/arch/arm/mach-clps711x/fortunet.c
+++ b/arch/arm/mach-clps711x/fortunet.c
@@ -31,6 +31,8 @@
 
 #include <asm/mach/arch.h>
 
+#include <asm/memory.h>
+
 #include "common.h"
 
 struct meminfo memmap = {
@@ -75,11 +77,12 @@ fortunet_fixup(struct machine_desc *desc, struct tag *tags,
 }
 
 MACHINE_START(FORTUNET, "ARM-FortuNet")
-       MAINTAINER("FortuNet Inc.")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf0000000)
-       BOOT_PARAMS(0x00000000)
-       FIXUP(fortunet_fixup)
-       MAPIO(clps711x_map_io)
-       INITIRQ(clps711x_init_irq)
+       /* Maintainer: FortuNet Inc. */
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xf0000000) >> 18) & 0xfffc,
+       .boot_params    = 0x00000000,
+       .fixup          = fortunet_fixup,
+       .map_io         = clps711x_map_io,
+       .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END