projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ce00417
)
x86: hpet: Fix copy-and-paste mistake in earlier change
author
Jan Beulich
<JBeulich@suse.com>
Fri, 25 May 2012 10:40:09 +0000
(11:40 +0100)
committer
Thomas Gleixner
<tglx@linutronix.de>
Fri, 25 May 2012 13:32:29 +0000
(15:32 +0200)
This fixes an oversight in
396e2c6fed4ff13b53ce0e573105531cf53b0cad
("x86: Clear HPET configuration registers on startup"), noticed by
Thomas Gleixner.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Link:
http://lkml.kernel.org/r/4FBF7DA902000078000861EE@nat28.tlf.novell.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/kernel/hpet.c
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/hpet.c
b/arch/x86/kernel/hpet.c
index 9cc7b4392f7c8b0462ad4d031667e5197eff9373..1460a5df92f7a7f314ed0be95a81765cf2df676e 100644
(file)
--- a/
arch/x86/kernel/hpet.c
+++ b/
arch/x86/kernel/hpet.c
@@
-870,7
+870,7
@@
int __init hpet_enable(void)
else
pr_warn("HPET initial state will not be saved\n");
cfg &= ~(HPET_CFG_ENABLE | HPET_CFG_LEGACY);
- hpet_writel(cfg, HPET_
Tn_CFG(i)
);
+ hpet_writel(cfg, HPET_
CFG
);
if (cfg)
pr_warn("HPET: Unrecognized bits %#x set in global cfg\n",
cfg);