diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 17:27:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 17:27:45 -0400 |
| commit | 3fab191002b184e4390aa07c7149c6cc7b638ec7 (patch) | |
| tree | 821382d49e47c19531bfc3bb9e1f8922486374d4 /arch/x86/kernel/quirks.c | |
| parent | 93394a761d78503f11d05b1a7b23d5a9ccc8dad2 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
Merge branch 'linus' into x86/core
Diffstat (limited to 'arch/x86/kernel/quirks.c')
| -rw-r--r-- | arch/x86/kernel/quirks.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c index 6a5a2970f4c..e95022e4f5d 100644 --- a/arch/x86/kernel/quirks.c +++ b/arch/x86/kernel/quirks.c | |||
| @@ -171,7 +171,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_4, | |||
| 171 | ich_force_enable_hpet); | 171 | ich_force_enable_hpet); |
| 172 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_7, | 172 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_7, |
| 173 | ich_force_enable_hpet); | 173 | ich_force_enable_hpet); |
| 174 | 174 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x3a16, /* ICH10 */ | |
| 175 | ich_force_enable_hpet); | ||
| 175 | 176 | ||
| 176 | static struct pci_dev *cached_dev; | 177 | static struct pci_dev *cached_dev; |
| 177 | 178 | ||