diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 23:46:24 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 23:46:24 +0100 |
| commit | 25cf0398bdf365d027e171116aa4a281e9cd3c1c (patch) | |
| tree | a8be3d3d314625a376be0e62c67809dc22274dd4 /arch/arm/mach-pxa/poodle.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable (diff) | |
| parent | ARM: pxa: Add Balloon3 NAND ready check (diff) | |
| download | linux-25cf0398bdf365d027e171116aa4a281e9cd3c1c.tar.xz linux-25cf0398bdf365d027e171116aa4a281e9cd3c1c.zip | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-pxa/poodle.c')
| -rw-r--r-- | arch/arm/mach-pxa/poodle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index 93a191c889df..8451790cb48d 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c @@ -466,7 +466,7 @@ static void __init fixup_poodle(struct machine_desc *desc, MACHINE_START(POODLE, "SHARP Poodle") .fixup = fixup_poodle, - .map_io = pxa_map_io, + .map_io = pxa25x_map_io, .nr_irqs = POODLE_NR_IRQS, /* 4 for LoCoMo */ .init_irq = pxa25x_init_irq, .timer = &pxa_timer, |