summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-01-11 13:48:17 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-01-11 13:48:17 +0000
commit1aa023b8fda8096caf41c20427a0ef396d88eb0f (patch)
treed9eb0a50457fda3d996517aa81ceffa29b3052c8
parentc0fdcfa8e9a994176ff1070dced50eeff5f6f851 (diff)
ARM: integrator: fix compile warning in cpu.c
Fix: arch/arm/mach-integrator/cpu.c: In function ■integrator_get■: arch/arm/mach-integrator/cpu.c:164: warning: ■vco.s■ may be used uninitialized in this function Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-integrator/cpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c
index a3fbcb3adc29..fbb457779895 100644
--- 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;