lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus' into x86/cpu

Browse Source
This commit is contained in:
Ingo Molnar
2009-06-07 12:22:15 +02:00
parent 9b94b3a19b b87297fb40
commit 5f4457a4f6
2856 changed files with 85615 additions and 66981 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/quirks.c
View File

@@ -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,