[PATCH] ARM: Remove machine description macros

Remove the pointless machine description macros, favouring C99
initialisers instead.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 12 insertions, 9 deletions

diff --git a/arch/arm/mach-footbridge/netwinder-hw.c b/arch/arm/mach-footbridge/netwinder-hw.c
index 1e1dfd79f4fe..775f85fc8513 100644
--- a/arch/arm/mach-footbridge/netwinder-hw.c
+++ b/arch/arm/mach-footbridge/netwinder-hw.c
@@ -647,14 +647,17 @@ fixup_netwinder(struct machine_desc *desc, struct tag *tags,
 }
 
 MACHINE_START(NETWINDER, "Rebel-NetWinder")
-        MAINTAINER("Russell King/Rebel.com")
-        BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
-        BOOT_PARAMS(0x00000100)
-        VIDEO(0x000a0000, 0x000bffff)
-        DISABLE_PARPORT(0)
-        DISABLE_PARPORT(2)
-        FIXUP(fixup_netwinder)
-        MAPIO(footbridge_map_io)
-        INITIRQ(footbridge_init_irq)
+        /* Maintainer: Russell King/Rebel.com */
+        .phys_ram       = 0x00000000,
+        .phys_io        = DC21285_ARMCSR_BASE,
+        .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
+        .boot_params    = 0x00000100,
+        .video_start    = 0x000a0000,
+        .video_end      = 0x000bffff,
+        .reserve_lp0    = 1,
+        .reserve_lp2    = 1,
+        .fixup          = fixup_netwinder,
+        .map_io         = footbridge_map_io,
+        .init_irq       = footbridge_init_irq,
         .timer          = &isa_timer,
 MACHINE_END