aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-versatile/versatile_pb.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-07-03 17:38:58 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-07-03 17:38:58 +0100
commite9dea0c65d2de6981356c055781fb99d7191b14e (patch)
tree106e6302238f561e679e479584095d49fe5c66fd /arch/arm/mach-versatile/versatile_pb.c
parent1d6bebf2ecf92924492c491d9c3a72edba95f907 (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/versatile_pb.c')
-rw-r--r--arch/arm/mach-versatile/versatile_pb.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c
index 2702099a68f..7c3078c3891 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)
arch_initcall(versatile_pb_init);
MACHINE_START(VERSATILE_PB, "ARM-Versatile PB")
- MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
- BOOT_MEM(0x00000000, 0x101f1000, 0xf11f1000)
- BOOT_PARAMS(0x00000100)
- MAPIO(versatile_map_io)
- INITIRQ(versatile_init_irq)
+ /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
+ .phys_ram = 0x00000000,
+ .phys_io = 0x101f1000,
+ .io_pg_offst = ((0xf11f1000) >> 18) & 0xfffc,
+ .boot_params = 0x00000100,
+ .map_io = versatile_map_io,
+ .init_irq = versatile_init_irq,
.timer = &versatile_timer,
- INIT_MACHINE(versatile_init)
+ .init_machine = versatile_init,
MACHINE_END