Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[cascardo/linux.git] / arch / x86_64 / kernel / early-quirks.c

diff --git a/arch/x86_64/kernel/early-quirks.c b/arch/x86_64/kernel/early-quirks.c
index 148c6bc..990d9c2 100644 (file)
--- a/arch/x86_64/kernel/early-quirks.c
+++ b/arch/x86_64/kernel/early-quirks.c
@@ -71,28 +71,15 @@ static void __init ati_bugs(void)
        }
 }
 
-static void intel_bugs(void)
-{
-       u16 device = read_pci_config_16(0, 0, 0, PCI_DEVICE_ID);
-
-#ifdef CONFIG_SMP
-       if (device == PCI_DEVICE_ID_INTEL_E7320_MCH ||
-           device == PCI_DEVICE_ID_INTEL_E7520_MCH ||
-           device == PCI_DEVICE_ID_INTEL_E7525_MCH)
-               quirk_intel_irqbalance();
-#endif
-}
-
 struct chipset {
        u16 vendor;
        void (*f)(void);
 };
 
-static struct __initdata chipset early_qrk[] = {
+static struct chipset early_qrk[] __initdata = {
        { PCI_VENDOR_ID_NVIDIA, nvidia_bugs },
        { PCI_VENDOR_ID_VIA, via_bugs },
        { PCI_VENDOR_ID_ATI, ati_bugs },
-       { PCI_VENDOR_ID_INTEL, intel_bugs},
        {}
 };