summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-04-23 19:19:42 -0400
committerIngo Molnar <mingo@elte.hu>2009-04-24 08:41:39 +0200
commitd2c8604121648b744ebb127991f1c5876931885e (patch)
tree8da7c5fc983a4646de796c82bbc542d868b42d0a /arch/x86
parent4c31e92b97b6d7e7b19ee5e54a22571ffdebb305 (diff)
downloadlinux-3.10-d2c8604121648b744ebb127991f1c5876931885e.tar.gz
linux-3.10-d2c8604121648b744ebb127991f1c5876931885e.tar.bz2
linux-3.10-d2c8604121648b744ebb127991f1c5876931885e.zip
x86, hpet: Stop soliciting hpet=force users on ICH4M
The HPET in the ICH4M is not documented in the data sheet because it was not officially validated. While it is fine for hackers to continue to use "hpet=force" to enable the hardware that they have, it is not prudent to solicit additional "hpet=force" users on this hardware. [ Impact: remove hpet=force syslog message on old-ICH systems ] Signed-off-by: Len Brown <len.brown@intel.com> Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> LKML-Reference: <alpine.LFD.2.00.0904231918510.15843@localhost.localdomain> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/quirks.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
index e95022e4f5d..7563b31b4f0 100644
--- a/arch/x86/kernel/quirks.c
+++ b/arch/x86/kernel/quirks.c
@@ -261,8 +261,6 @@ static void old_ich_force_enable_hpet_user(struct pci_dev *dev)
{
if (hpet_force_user)
old_ich_force_enable_hpet(dev);
- else
- hpet_print_force_info();
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1,