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-38-rc2' of git://codeaurora.org/quic/kernel/davidb/linux-msm
[pandora-kernel.git]
/
arch
/
arm
/
mach-integrator
/
cpu.c
diff --git
a/arch/arm/mach-integrator/cpu.c
b/arch/arm/mach-integrator/cpu.c
index
a3fbcb3
..
fbb4577
100644
(file)
--- a/
arch/arm/mach-integrator/cpu.c
+++ b/
arch/arm/mach-integrator/cpu.c
@@
-173,7
+173,7
@@
static unsigned int integrator_get(unsigned int cpu)
if (machine_is_integrator()) {
vco.s = (cm_osc >> 8) & 7;
- } else
if (machine_is_cintegrator())
{
+ } else {
vco.s = 1;
}
vco.v = cm_osc & 255;