aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/hpet.c
diff options
context:
space:
mode:
authorJanne Kulmala <janne.t.kulmala@tut.fi>2008-12-16 06:39:57 -0500
committerIngo Molnar <mingo@elte.hu>2008-12-16 14:36:44 -0500
commitbacbe9994541c70aa3abd1a013ac738e58d4bfb2 (patch)
tree10663090e295562d65774c34a13e412ed2e763ef /arch/x86/kernel/hpet.c
parente45f2c07742d447597df001c878bc4a8aafcde37 (diff)
x86: enable HPET on Fujitsu u9200
Impact: auto-enable HPET on Fujitsu u9200 HPET timer is listed in the ACPI table, but needs a quirk entry in order to work. Unfortunately, the quirk code runs after first HPET hpet_enable() which has already determined that the timer doesn't work (reads 0xFFFFFFFF). This patch allows hpet_enable() to be called again after running the quirk code. Signed-off-by: Janne Kulmala <janne.t.kulmala@tut.fi> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/hpet.c')
-rw-r--r--arch/x86/kernel/hpet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 067d8de913f6..84089dc8fd1d 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -811,7 +811,7 @@ int __init hpet_enable(void)
811 811
812out_nohpet: 812out_nohpet:
813 hpet_clear_mapping(); 813 hpet_clear_mapping();
814 boot_hpet_disable = 1; 814 hpet_address = 0;
815 return 0; 815 return 0;
816} 816}
817 817