diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-03 17:38:58 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-03 17:38:58 +0100 |
commit | e9dea0c65d2de6981356c055781fb99d7191b14e (patch) | |
tree | 106e6302238f561e679e479584095d49fe5c66fd /arch/arm/mach-sa1100/collie.c | |
parent | 1d6bebf2ecf92924492c491d9c3a72edba95f907 (diff) | |
download | kernel_samsung_tuna-e9dea0c65d2de6981356c055781fb99d7191b14e.zip kernel_samsung_tuna-e9dea0c65d2de6981356c055781fb99d7191b14e.tar.gz kernel_samsung_tuna-e9dea0c65d2de6981356c055781fb99d7191b14e.tar.bz2 |
[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-sa1100/collie.c')
-rw-r--r-- | arch/arm/mach-sa1100/collie.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index 9928789..8cb6911 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c @@ -184,9 +184,11 @@ static void __init collie_map_io(void) } MACHINE_START(COLLIE, "Sharp-Collie") - BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) - MAPIO(collie_map_io) - INITIRQ(sa1100_init_irq) + .phys_ram = 0xc0000000, + .phys_io = 0x80000000, + .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, + .map_io = collie_map_io, + .init_irq = sa1100_init_irq, .timer = &sa1100_timer, .init_machine = collie_init, MACHINE_END |