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/dtor/input
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5p64x0
/
cpu.c
diff --git
a/arch/arm/mach-s5p64x0/cpu.c
b/arch/arm/mach-s5p64x0/cpu.c
index
b8d02eb
..
a5c0095
100644
(file)
--- a/
arch/arm/mach-s5p64x0/cpu.c
+++ b/
arch/arm/mach-s5p64x0/cpu.c
@@
-119,7
+119,7
@@
void __init s5p6450_map_io(void)
s3c_adc_setname("s3c64xx-adc");
iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc));
- iotable_init(s5p6450_iodesc, ARRAY_SIZE(s5p64
4
0_iodesc));
+ iotable_init(s5p6450_iodesc, ARRAY_SIZE(s5p64
5
0_iodesc));
}
/*