[adm5120] add initial support for 2.6.25
[openwrt/svn-archive/archive.git] / target / linux / adm5120 / patches-2.6.25 / 202-pci_disable_common_quirks.patch
diff --git a/target/linux/adm5120/patches-2.6.25/202-pci_disable_common_quirks.patch b/target/linux/adm5120/patches-2.6.25/202-pci_disable_common_quirks.patch
new file mode 100644 (file)
index 0000000..7a8753f
--- /dev/null
@@ -0,0 +1,50 @@
+Index: linux-2.6.25/drivers/pci/Kconfig
+===================================================================
+--- linux-2.6.25.orig/drivers/pci/Kconfig
++++ linux-2.6.25/drivers/pci/Kconfig
+@@ -42,6 +42,12 @@ config PCI_DEBUG
+         When in doubt, say N.
++config PCI_DISABLE_COMMON_QUIRKS
++      bool "PCI disable common quirks"
++      depends on PCI
++      help
++        If you don't know what to do here, say N.
++
+ config HT_IRQ
+       bool "Interrupts on hypertransport devices"
+       default y
+Index: linux-2.6.25/drivers/pci/quirks.c
+===================================================================
+--- linux-2.6.25.orig/drivers/pci/quirks.c
++++ linux-2.6.25/drivers/pci/quirks.c
+@@ -24,6 +24,7 @@
+ #include <linux/kallsyms.h>
+ #include "pci.h"
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ /* 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.
+@@ -1495,6 +1496,7 @@ static void __devinit fixup_rev1_53c810(
+       }
+ }
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
+ static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end)
+ {
+@@ -1562,6 +1564,7 @@ void pci_fixup_device(enum pci_fixup_pas
+ }
+ EXPORT_SYMBOL(pci_fixup_device);
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ /* Enable 1k I/O space granularity on the Intel P64H2 */
+ static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
+ {
+@@ -1875,3 +1878,4 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT
+                       quirk_msi_intx_disable_bug);
+ #endif /* CONFIG_PCI_MSI */
++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */