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 / clep7312.c

diff --git a/arch/arm/mach-clps711x/clep7312.c b/arch/arm/mach-clps711x/clep7312.c
index 9ca21cb..09fb57e 100644 (file)
--- a/arch/arm/mach-clps711x/clep7312.c
+++ b/arch/arm/mach-clps711x/clep7312.c
@@ -37,12 +37,13 @@ fixup_clep7312(struct machine_desc *desc, struct tag *tags,
 
 
 MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312")
-       MAINTAINER("Nobody")
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
-       BOOT_PARAMS(0xc0000100)
-       FIXUP(fixup_clep7312)
-       MAPIO(clps711x_map_io)
-       INITIRQ(clps711x_init_irq)
+       /* Maintainer: Nobody */
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
+       .boot_params    = 0xc0000100,
+       .fixup          = fixup_clep7312,
+       .map_io         = clps711x_map_io,
+       .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END