[PATCH] revert "PCI: quirk for IBM Dock II cardbus controllers"

Fix http://bugzilla.kernel.org/show_bug.cgi?id=7264

We need to target this quirk a little more tightly, using the T20 DMI string.

Cc: Pavel Kysilka <goldenfish@bsys.cz>
Acked-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Daniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 204b1c8e972bcaa06c43b6900ecebb7a9a99bde3..5b448381169193239d48ee89d6deab5827480d35 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1460,33 +1460,6 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,     0x2609, quirk_intel_pcie_pm);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,   0x260a, quirk_intel_pcie_pm);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,   0x260b, quirk_intel_pcie_pm);
 
-/*
- * Fixup the cardbus bridges on the IBM Dock II docking station
- */
-static void __devinit quirk_ibm_dock2_cardbus(struct pci_dev *dev)
-{
-       u32 val;
-
-       /*
-        * tie the 2 interrupt pins to INTA, and configure the
-        * multifunction routing register to handle this.
-        */
-       if ((dev->subsystem_vendor == PCI_VENDOR_ID_IBM) &&
-               (dev->subsystem_device == 0x0148)) {
-               printk(KERN_INFO "PCI: Found IBM Dock II Cardbus Bridge "
-                       "applying quirk\n");
-               pci_read_config_dword(dev, 0x8c, &val);
-               val = ((val & 0xffffff00) | 0x1002);
-               pci_write_config_dword(dev, 0x8c, val);
-               pci_read_config_dword(dev, 0x80, &val);
-               val = ((val & 0x00ffff00) | 0x2864c077);
-               pci_write_config_dword(dev, 0x80, val);
-       }
-}
-
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_1420,
-                               quirk_ibm_dock2_cardbus);
-
 static void __devinit quirk_netmos(struct pci_dev *dev)
 {
        unsigned int num_parallel = (dev->subsystem_device & 0xf0) >> 4;