[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-omap/board-generic.c b/arch/arm/mach-omap/board-generic.c
index 2102a2cd1013..384bc7cec1db 100644
--- a/arch/arm/mach-omap/board-generic.c
+++ b/arch/arm/mach-omap/board-generic.c
@@ -88,11 +88,13 @@ static void __init omap_generic_map_io(void)
 }
 
 MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")
-        MAINTAINER("Tony Lindgren <tony@atomide.com>")
-        BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
-        BOOT_PARAMS(0x10000100)
-        MAPIO(omap_generic_map_io)
-        INITIRQ(omap_generic_init_irq)
-        INIT_MACHINE(omap_generic_init)
+        /* Maintainer: Tony Lindgren <tony@atomide.com> */
+        .phys_ram       = 0x10000000,
+        .phys_io        = 0xfff00000,
+        .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
+        .boot_params    = 0x10000100,
+        .map_io         = omap_generic_map_io,
+        .init_irq       = omap_generic_init_irq,
+        .init_machine   = omap_generic_init,
         .timer          = &omap_timer,
 MACHINE_END