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

diff --git a/arch/arm/mach-versatile/versatile_ab.c b/arch/arm/mach-versatile/versatile_ab.c
index d332084586cf..8b0b3bef24ae 100644
--- a/arch/arm/mach-versatile/versatile_ab.c
+++ b/arch/arm/mach-versatile/versatile_ab.c
@@ -35,11 +35,13 @@
 #include "core.h"
 
 MACHINE_START(VERSATILE_AB, "ARM-Versatile AB")
-        MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
-        BOOT_MEM(0x00000000, 0x101f1000, 0xf11f1000)
-        BOOT_PARAMS(0x00000100)
-        MAPIO(versatile_map_io)
-        INITIRQ(versatile_init_irq)
+        /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
+        .phys_ram       = 0x00000000,
+        .phys_io        = 0x101f1000,
+        .io_pg_offst    = ((0xf11f1000) >> 18) & 0xfffc,
+        .boot_params    = 0x00000100,
+        .map_io         = versatile_map_io,
+        .init_irq       = versatile_init_irq,
         .timer          = &versatile_timer,
-        INIT_MACHINE(versatile_init)
+        .init_machine   = versatile_init,
 MACHINE_END