[PATCH] ARM: Remove machine description macros

[karo-tx-linux.git] / arch / arm / mach-ixp2000 / ixdp2x01.c

diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c
index e94dace3d412299279cc2e345d1c35db8d9728c7..c73588743ee12f9f1b7c7ecd1aa74db5a9fa8800 100644 (file)
--- a/arch/arm/mach-ixp2000/ixdp2x01.c
+++ b/arch/arm/mach-ixp2000/ixdp2x01.c
@@ -375,25 +375,29 @@ static void __init ixdp2x01_init_machine(void)
 
 #ifdef CONFIG_ARCH_IXDP2401
 MACHINE_START(IXDP2401, "Intel IXDP2401 Development Platform")
-       MAINTAINER("MontaVista Software, Inc.")
-       BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
-       BOOT_PARAMS(0x00000100)
-       MAPIO(ixdp2x01_map_io)
-       INITIRQ(ixdp2x01_init_irq)
+       /* Maintainer: MontaVista Software, Inc. */
+       .phys_ram       = 0x00000000,
+       .phys_io        = IXP2000_UART_PHYS_BASE,
+       .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .map_io         = ixdp2x01_map_io,
+       .init_irq       = ixdp2x01_init_irq,
        .timer          = &ixdp2x01_timer,
-       INIT_MACHINE(ixdp2x01_init_machine)
+       .init_machine   = ixdp2x01_init_machine,
 MACHINE_END
 #endif
 
 #ifdef CONFIG_ARCH_IXDP2801
 MACHINE_START(IXDP2801, "Intel IXDP2801 Development Platform")
-       MAINTAINER("MontaVista Software, Inc.")
-       BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
-       BOOT_PARAMS(0x00000100)
-       MAPIO(ixdp2x01_map_io)
-       INITIRQ(ixdp2x01_init_irq)
+       /* Maintainer: MontaVista Software, Inc. */
+       .phys_ram       = 0x00000000,
+       .phys_io        = IXP2000_UART_PHYS_BASE,
+       .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .map_io         = ixdp2x01_map_io,
+       .init_irq       = ixdp2x01_init_irq,
        .timer          = &ixdp2x01_timer,
-       INIT_MACHINE(ixdp2x01_init_machine)
+       .init_machine   = ixdp2x01_init_machine,
 MACHINE_END
 #endif