git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
gumstix.c
diff --git
a/arch/arm/mach-pxa/gumstix.c
b/arch/arm/mach-pxa/gumstix.c
index
1e2a9a1
..
6fd319e
100644
(file)
--- 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 */
MACHINE_START(GUMSTIX, "Gumstix")
.boot_params = 0xa0000100, /* match u-boot bi_boot_params */
- .map_io = pxa_map_io,
+ .map_io = pxa
25x
_map_io,
.init_irq = pxa25x_init_irq,
.timer = &pxa_timer,
.init_machine = gumstix_init,
.init_irq = pxa25x_init_irq,
.timer = &pxa_timer,
.init_machine = gumstix_init,