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-versatile | |
| 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-versatile')
| -rw-r--r-- | arch/arm/mach-versatile/versatile_ab.c | 14 | ||||
| -rw-r--r-- | arch/arm/mach-versatile/versatile_pb.c | 14 |
2 files changed, 16 insertions, 12 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 @@ | |||
| 35 | #include "core.h" | 35 | #include "core.h" |
| 36 | 36 | ||
| 37 | MACHINE_START(VERSATILE_AB, "ARM-Versatile AB") | 37 | MACHINE_START(VERSATILE_AB, "ARM-Versatile AB") |
| 38 | MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd") | 38 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
| 39 | BOOT_MEM(0x00000000, 0x101f1000, 0xf11f1000) | 39 | .phys_ram = 0x00000000, |
| 40 | BOOT_PARAMS(0x00000100) | 40 | .phys_io = 0x101f1000, |
| 41 | MAPIO(versatile_map_io) | 41 | .io_pg_offst = ((0xf11f1000) >> 18) & 0xfffc, |
| 42 | INITIRQ(versatile_init_irq) | 42 | .boot_params = 0x00000100, |
| 43 | .map_io = versatile_map_io, | ||
| 44 | .init_irq = versatile_init_irq, | ||
| 43 | .timer = &versatile_timer, | 45 | .timer = &versatile_timer, |
| 44 | INIT_MACHINE(versatile_init) | 46 | .init_machine = versatile_init, |
| 45 | MACHINE_END | 47 | MACHINE_END |
diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c index 2702099a68f3..7c3078c38916 100644 --- a/arch/arm/mach-versatile/versatile_pb.c +++ b/arch/arm/mach-versatile/versatile_pb.c | |||
| @@ -99,11 +99,13 @@ static int __init versatile_pb_init(void) | |||
| 99 | arch_initcall(versatile_pb_init); | 99 | arch_initcall(versatile_pb_init); |
| 100 | 100 | ||
| 101 | MACHINE_START(VERSATILE_PB, "ARM-Versatile PB") | 101 | MACHINE_START(VERSATILE_PB, "ARM-Versatile PB") |
| 102 | MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd") | 102 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
| 103 | BOOT_MEM(0x00000000, 0x101f1000, 0xf11f1000) | 103 | .phys_ram = 0x00000000, |
| 104 | BOOT_PARAMS(0x00000100) | 104 | .phys_io = 0x101f1000, |
| 105 | MAPIO(versatile_map_io) | 105 | .io_pg_offst = ((0xf11f1000) >> 18) & 0xfffc, |
| 106 | INITIRQ(versatile_init_irq) | 106 | .boot_params = 0x00000100, |
| 107 | .map_io = versatile_map_io, | ||
| 108 | .init_irq = versatile_init_irq, | ||
| 107 | .timer = &versatile_timer, | 109 | .timer = &versatile_timer, |
| 108 | INIT_MACHINE(versatile_init) | 110 | .init_machine = versatile_init, |
| 109 | MACHINE_END | 111 | MACHINE_END |