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

diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c
index aa0e2f6e02f6..726445895b5c 100644
--- a/arch/arm/mach-shark/core.c
+++ b/arch/arm/mach-shark/core.c
@@ -105,10 +105,12 @@ static struct sys_timer shark_timer = {
 };
 
 MACHINE_START(SHARK, "Shark")
-        MAINTAINER("Alexander Schulz")
-        BOOT_MEM(0x08000000, 0x40000000, 0xe0000000)
-        BOOT_PARAMS(0x08003000)
-        MAPIO(shark_map_io)
-        INITIRQ(shark_init_irq)
+        /* Maintainer: Alexander Schulz */
+        .phys_ram       = 0x08000000,
+        .phys_io        = 0x40000000,
+        .io_pg_offst    = ((0xe0000000) >> 18) & 0xfffc,
+        .boot_params    = 0x08003000,
+        .map_io         = shark_map_io,
+        .init_irq       = shark_init_irq,
         .timer          = &shark_timer,
 MACHINE_END