diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-06 15:35:18 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-06 15:35:18 -0700 |
commit | 67d340f440f389e9d56201fb7c7aaa92f262feb1 (patch) | |
tree | a96c26a370beb23282a561ddd936e5d0aa93adde /arch/arm/mach-pxa/poodle.c | |
parent | [IA64] restore_sigcontext is not preempt safe (diff) | |
parent | [PATCH] Fix bt87x.c build problem for real (diff) | |
download | linux-dev-67d340f440f389e9d56201fb7c7aaa92f262feb1.tar.xz linux-dev-67d340f440f389e9d56201fb7c7aaa92f262feb1.zip |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/arm/mach-pxa/poodle.c')
-rw-r--r-- | arch/arm/mach-pxa/poodle.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index b6c746ea3830..0e4f6fab100a 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c @@ -180,10 +180,12 @@ static void __init poodle_map_io(void) } MACHINE_START(POODLE, "SHARP Poodle") - BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000)) - FIXUP(fixup_poodle) - MAPIO(poodle_map_io) - INITIRQ(pxa_init_irq) - .timer = &pxa_timer, - .init_machine = poodle_init, + .phys_ram = 0xa0000000, + .phys_io = 0x40000000, + .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, + .fixup = fixup_poodle, + .map_io = poodle_map_io, + .init_irq = pxa_init_irq, + .timer = &pxa_timer, + .init_machine = poodle_init, MACHINE_END |