diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 13:39:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 13:39:57 -0400 |
| commit | da6e88f4963385b1b649b043691d206fbb951913 (patch) | |
| tree | 779a1a6cf04dad09dee0828ad4ece0927de1b5f3 /arch/x86 | |
| parent | 61d97f4fcf73d30864a52373a34093be25be6a03 (diff) | |
| parent | 7dc9719682ce8c46215bc9a1bdc7ee0c38ada94b (diff) | |
Merge branch 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: add PCI ID for 6300ESB force hpet
x86: add another PCI ID for ICH6 force-hpet
kernel-paramaters: document pmtmr= command line option
acpi_pm clccksource: fix printk format warning
nohz: don't stop idle tick if softirqs are pending.
pmtmr: allow command line override of ioport
nohz: reduce jiffies polling overhead
hrtimer: Remove unused variables in ktime_divns()
hrtimer: remove warning in hres_timers_resume
posix-timers: print RT watchdog message
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/quirks.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c index 79bdcd11c66e..d13858818100 100644 --- a/arch/x86/kernel/quirks.c +++ b/arch/x86/kernel/quirks.c | |||
| @@ -266,6 +266,8 @@ static void old_ich_force_enable_hpet_user(struct pci_dev *dev) | |||
| 266 | hpet_print_force_info(); | 266 | hpet_print_force_info(); |
| 267 | } | 267 | } |
| 268 | 268 | ||
| 269 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1, | ||
| 270 | old_ich_force_enable_hpet_user); | ||
| 269 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, | 271 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, |
| 270 | old_ich_force_enable_hpet_user); | 272 | old_ich_force_enable_hpet_user); |
| 271 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12, | 273 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12, |