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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
himalaya.c
diff --git
a/arch/arm/mach-pxa/himalaya.c
b/arch/arm/mach-pxa/himalaya.c
index
01b7f07
..
e8603eb
100644
(file)
--- a/
arch/arm/mach-pxa/himalaya.c
+++ b/
arch/arm/mach-pxa/himalaya.c
@@
-160,7
+160,7
@@
static void __init himalaya_init(void)
MACHINE_START(HIMALAYA, "HTC Himalaya")
.boot_params = 0xa0000100,
- .map_io = pxa_map_io,
+ .map_io = pxa
25x
_map_io,
.init_irq = pxa25x_init_irq,
.init_machine = himalaya_init,
.timer = &pxa_timer,