diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-03 14:39:33 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-03 14:39:33 -0700 |
commit | 19f7241a3b087bbf4dd107c979608fdb56c83a09 (patch) | |
tree | de5a3cb87a4731d8b8c075c6de4800fe52f5bc70 /arch/arm/mach-aaec2000 | |
parent | 08ab8c20316d6189a16b8101544a3e32b4c75e49 (diff) | |
parent | 0d670b413f042eccdffc45bafb9840244752707f (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-aaec2000')
-rw-r--r-- | arch/arm/mach-aaec2000/aaed2000.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-aaec2000/aaed2000.c b/arch/arm/mach-aaec2000/aaed2000.c index 5417ca3f462..c9d89988664 100644 --- a/arch/arm/mach-aaec2000/aaed2000.c +++ b/arch/arm/mach-aaec2000/aaed2000.c @@ -40,9 +40,11 @@ static void __init aaed2000_map_io(void) } MACHINE_START(AAED2000, "Agilent AAED-2000 Development Platform") - MAINTAINER("Nicolas Bellido Y Ortega") - BOOT_MEM(0xf0000000, PIO_BASE, VIO_BASE) - MAPIO(aaed2000_map_io) - INITIRQ(aaed2000_init_irq) + /* Maintainer: Nicolas Bellido Y Ortega */ + .phys_ram = 0xf0000000, + .phys_io = PIO_BASE, + .io_pg_offst = ((VIO_BASE) >> 18) & 0xfffc, + .map_io = aaed2000_map_io, + .init_irq = aaed2000_init_irq, .timer = &aaec2000_timer, MACHINE_END |