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/penberg...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
pxa930.c
diff --git
a/arch/arm/mach-pxa/pxa930.c
b/arch/arm/mach-pxa/pxa930.c
index
0642920
..
8aeacf9
100644
(file)
--- a/
arch/arm/mach-pxa/pxa930.c
+++ b/
arch/arm/mach-pxa/pxa930.c
@@
-192,7
+192,7
@@
static struct mfp_addr_map pxa935_mfp_addr_map[] __initdata = {
static int __init pxa930_init(void)
{
- if (cpu_is_pxa93
0() || cpu_is_pxa935
()) {
+ if (cpu_is_pxa93
x
()) {
mfp_init_base(io_p2v(MFPR_BASE));
mfp_init_addr(pxa930_mfp_addr_map);
}