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 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
palmtx.c
diff --git
a/arch/arm/mach-pxa/palmtx.c
b/arch/arm/mach-pxa/palmtx.c
index
e5c9932
..
595f002
100644
(file)
--- a/
arch/arm/mach-pxa/palmtx.c
+++ b/
arch/arm/mach-pxa/palmtx.c
@@
-334,7
+334,7
@@
static struct map_desc palmtx_io_desc[] __initdata = {
static void __init palmtx_map_io(void)
{
static void __init palmtx_map_io(void)
{
- pxa_map_io();
+ pxa
27x
_map_io();
iotable_init(palmtx_io_desc, ARRAY_SIZE(palmtx_io_desc));
}
iotable_init(palmtx_io_desc, ARRAY_SIZE(palmtx_io_desc));
}