summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/gumstix.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2011-01-10 00:18:16 +0100
committerSteve French <sfrench@us.ibm.com>2011-01-10 00:18:16 +0100
commitacc6f11272ce4f77c40b1a6292eb198fd6aaf8c3 (patch)
tree2da3a61b6726707a89f1cf93446aabd2fb00e1f0 /arch/arm/mach-pxa/gumstix.c
parentCIFS: Simplify cifs_open code (diff)
parentMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/... (diff)
downloadlinux-acc6f11272ce4f77c40b1a6292eb198fd6aaf8c3.tar.xz
linux-acc6f11272ce4f77c40b1a6292eb198fd6aaf8c3.zip
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: fs/cifs/dir.c
Diffstat (limited to 'arch/arm/mach-pxa/gumstix.c')
-rw-r--r--arch/arm/mach-pxa/gumstix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c
index 1e2a9a13aec1..6fd319ea5284 100644
--- a/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@ -225,7 +225,7 @@ static void __init gumstix_init(void)
MACHINE_START(GUMSTIX, "Gumstix")
.boot_params = 0xa0000100, /* match u-boot bi_boot_params */
- .map_io = pxa_map_io,
+ .map_io = pxa25x_map_io,
.init_irq = pxa25x_init_irq,
.timer = &pxa_timer,
.init_machine = gumstix_init,