From d0efed44ccf7e2aa0c493e06889e1ab11c615426 Mon Sep 17 00:00:00 2001
From: Janne Kulmala <janne.t.kulmala@tut.fi>
Date: Tue, 16 Dec 2008 13:39:57 +0200
Subject: [PATCH] --- yaml --- r: 123231 b: refs/heads/master c:
 bacbe9994541c70aa3abd1a013ac738e58d4bfb2 h: refs/heads/master i:   123229:
 bbecc80d2d25050c87cd2641c27e532d4cebc5bb   123227:
 609056189ce456f78251e629359c114020d89769   123223:
 cdea7776cec63c2259d6cd83b735faaa70a1e9b5   123215:
 d406e2182f409b2f62c225a3a55d0b0c4d2918a5   123199:
 81aec45f56e4db90895e1d74c394df76c38ef98e v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/kernel/hpet.c   | 2 +-
 trunk/arch/x86/kernel/quirks.c | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3ec5a2816441..7277e087489f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e45f2c07742d447597df001c878bc4a8aafcde37
+refs/heads/master: bacbe9994541c70aa3abd1a013ac738e58d4bfb2
diff --git a/trunk/arch/x86/kernel/hpet.c b/trunk/arch/x86/kernel/hpet.c
index 067d8de913f6..84089dc8fd1d 100644
--- a/trunk/arch/x86/kernel/hpet.c
+++ b/trunk/arch/x86/kernel/hpet.c
@@ -811,7 +811,7 @@ int __init hpet_enable(void)
 
 out_nohpet:
 	hpet_clear_mapping();
-	boot_hpet_disable = 1;
+	hpet_address = 0;
 	return 0;
 }
 
diff --git a/trunk/arch/x86/kernel/quirks.c b/trunk/arch/x86/kernel/quirks.c
index 67465ed89310..309949e9e1c1 100644
--- a/trunk/arch/x86/kernel/quirks.c
+++ b/trunk/arch/x86/kernel/quirks.c
@@ -168,6 +168,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_31,
 			 ich_force_enable_hpet);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_1,
 			 ich_force_enable_hpet);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_4,
+			 ich_force_enable_hpet);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_7,
 			 ich_force_enable_hpet);