diff options
| author | Tony Luck | 2005-07-07 00:35:18 +0200 |
|---|---|---|
| committer | Tony Luck | 2005-07-07 00:35:18 +0200 |
| commit | 67d340f440f389e9d56201fb7c7aaa92f262feb1 (patch) | |
| tree | a96c26a370beb23282a561ddd936e5d0aa93adde /arch/arm/mach-pxa/mainstone.c | |
| parent | [IA64] restore_sigcontext is not preempt safe (diff) | |
| parent | [PATCH] Fix bt87x.c build problem for real (diff) | |
| download | kernel-qcow2-linux-67d340f440f389e9d56201fb7c7aaa92f262feb1.tar.gz kernel-qcow2-linux-67d340f440f389e9d56201fb7c7aaa92f262feb1.tar.xz kernel-qcow2-linux-67d340f440f389e9d56201fb7c7aaa92f262feb1.zip | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/arm/mach-pxa/mainstone.c')
| -rw-r--r-- | arch/arm/mach-pxa/mainstone.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index 9896afca751f..827b7b5a5be8 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c @@ -345,10 +345,12 @@ static void __init mainstone_map_io(void) } MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)") - MAINTAINER("MontaVista Software Inc.") - BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000)) - MAPIO(mainstone_map_io) - INITIRQ(mainstone_init_irq) + /* Maintainer: MontaVista Software Inc. */ + .phys_ram = 0xa0000000, + .phys_io = 0x40000000, + .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, + .map_io = mainstone_map_io, + .init_irq = mainstone_init_irq, .timer = &pxa_timer, - INIT_MACHINE(mainstone_init) + .init_machine = mainstone_init, MACHINE_END |