diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-03 12:38:58 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-03 12:38:58 -0400 |
| commit | e9dea0c65d2de6981356c055781fb99d7191b14e (patch) | |
| tree | 106e6302238f561e679e479584095d49fe5c66fd /arch/arm/mach-ixp4xx/coyote-setup.c | |
| parent | 1d6bebf2ecf92924492c491d9c3a72edba95f907 (diff) | |
[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>
Diffstat (limited to 'arch/arm/mach-ixp4xx/coyote-setup.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/coyote-setup.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c index 8a05a1227e5f..c6335f51907d 100644 --- a/arch/arm/mach-ixp4xx/coyote-setup.c +++ b/arch/arm/mach-ixp4xx/coyote-setup.c | |||
| @@ -100,14 +100,15 @@ static void __init coyote_init(void) | |||
| 100 | 100 | ||
| 101 | #ifdef CONFIG_ARCH_ADI_COYOTE | 101 | #ifdef CONFIG_ARCH_ADI_COYOTE |
| 102 | MACHINE_START(ADI_COYOTE, "ADI Engineering Coyote") | 102 | MACHINE_START(ADI_COYOTE, "ADI Engineering Coyote") |
| 103 | MAINTAINER("MontaVista Software, Inc.") | 103 | /* Maintainer: MontaVista Software, Inc. */ |
| 104 | BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS, | 104 | .phys_ram = PHYS_OFFSET, |
| 105 | IXP4XX_PERIPHERAL_BASE_VIRT) | 105 | .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, |
| 106 | MAPIO(coyote_map_io) | 106 | .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, |
| 107 | INITIRQ(ixp4xx_init_irq) | 107 | .map_io = coyote_map_io, |
| 108 | .init_irq = ixp4xx_init_irq, | ||
| 108 | .timer = &ixp4xx_timer, | 109 | .timer = &ixp4xx_timer, |
| 109 | BOOT_PARAMS(0x0100) | 110 | .boot_params = 0x0100, |
| 110 | INIT_MACHINE(coyote_init) | 111 | .init_machine = coyote_init, |
| 111 | MACHINE_END | 112 | MACHINE_END |
| 112 | #endif | 113 | #endif |
| 113 | 114 | ||
| @@ -117,14 +118,15 @@ MACHINE_END | |||
| 117 | */ | 118 | */ |
| 118 | #ifdef CONFIG_MACH_IXDPG425 | 119 | #ifdef CONFIG_MACH_IXDPG425 |
| 119 | MACHINE_START(IXDPG425, "Intel IXDPG425") | 120 | MACHINE_START(IXDPG425, "Intel IXDPG425") |
| 120 | MAINTAINER("MontaVista Software, Inc.") | 121 | /* Maintainer: MontaVista Software, Inc. */ |
| 121 | BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS, | 122 | .phys_ram = PHYS_OFFSET, |
| 122 | IXP4XX_PERIPHERAL_BASE_VIRT) | 123 | .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, |
| 123 | MAPIO(coyote_map_io) | 124 | .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, |
| 124 | INITIRQ(ixp4xx_init_irq) | 125 | .map_io = coyote_map_io, |
| 126 | .init_irq = ixp4xx_init_irq, | ||
| 125 | .timer = &ixp4xx_timer, | 127 | .timer = &ixp4xx_timer, |
| 126 | BOOT_PARAMS(0x0100) | 128 | .boot_params = 0x0100, |
| 127 | INIT_MACHINE(coyote_init) | 129 | .init_machine = coyote_init, |
| 128 | MACHINE_END | 130 | MACHINE_END |
| 129 | #endif | 131 | #endif |
| 130 | 132 | ||