[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, 9 insertions, 7 deletions

diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c
index d1ced86c379c..49b898af0032 100644
--- a/arch/arm/mach-footbridge/cats-hw.c
+++ b/arch/arm/mach-footbridge/cats-hw.c
@@ -84,12 +84,14 @@ fixup_cats(struct machine_desc *desc, struct tag *tags,
 }
 
 MACHINE_START(CATS, "Chalice-CATS")
-        MAINTAINER("Philip Blundell")
-        BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
-        BOOT_PARAMS(0x00000100)
-        SOFT_REBOOT
-        FIXUP(fixup_cats)
-        MAPIO(footbridge_map_io)
-        INITIRQ(footbridge_init_irq)
+        /* Maintainer: Philip Blundell */
+        .phys_ram       = 0x00000000,
+        .phys_io        = DC21285_ARMCSR_BASE,
+        .io_pg_offst    = ((0xfe000000) >> 18) & 0xfffc,
+        .boot_params    = 0x00000100,
+        .soft_reboot    = 1,
+        .fixup          = fixup_cats,
+        .map_io         = footbridge_map_io,
+        .init_irq       = footbridge_init_irq,
         .timer          = &isa_timer,
 MACHINE_END