kernel: refresh patches with 2.6.34-rc4

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.34 / 030-pci_disable_common_quirks.patch

diff --git a/target/linux/generic-2.6/patches-2.6.34/030-pci_disable_common_quirks.patch b/target/linux/generic-2.6/patches-2.6.34/030-pci_disable_common_quirks.patch
index 96b4b33..0cf1978 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.34/030-pci_disable_common_quirks.patch
+++ b/target/linux/generic-2.6/patches-2.6.34/030-pci_disable_common_quirks.patch
@@ -1,6 +1,6 @@
 --- a/drivers/pci/Kconfig
 +++ b/drivers/pci/Kconfig
-@@ -51,6 +51,12 @@ config PCI_STUB
+@@ -40,6 +40,12 @@ config PCI_STUB
  
          When in doubt, say N.
  
@@ -15,7 +15,7 @@
        default y
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -96,6 +96,7 @@ static void __devinit quirk_resource_ali
+@@ -91,6 +91,7 @@ static void __devinit quirk_resource_ali
  }
  DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_resource_alignment);
  
@@ -23,7 +23,7 @@
  /* The Mellanox Tavor device gives false positive parity errors
   * Mark this device with a broken_parity_status, to allow
   * PCI scanning code to "skip" this now blacklisted device.
-@@ -1905,7 +1906,9 @@ static void __devinit fixup_rev1_53c810(
+@@ -1901,7 +1902,9 @@ static void __devinit fixup_rev1_53c810(
        }
  }
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
@@ -33,11 +33,11 @@
  /* Enable 1k I/O space granularity on the Intel P64H2 */
  static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
  {
-@@ -2536,6 +2539,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150d, quirk_i82576_sriov);
+@@ -2551,6 +2554,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
  
  #endif        /* CONFIG_PCI_IOV */
 +#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
  
- static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,
-                         struct pci_fixup *end)
+ /*
+  * This is a quirk for the Ricoh MMC controller found as a part of