projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c0fdcfa
)
ARM: integrator: fix compile warning in cpu.c
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Tue, 11 Jan 2011 13:48:17 +0000
(13:48 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Tue, 11 Jan 2011 13:48:17 +0000
(13:48 +0000)
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>
arch/arm/mach-integrator/cpu.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-integrator/cpu.c
b/arch/arm/mach-integrator/cpu.c
index a3fbcb3adc2959fbcf6e2437a94ea018b75fa7c7..fbb4577798954717775016c34c9aa49b734c17fe 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;