diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-05-22 11:26:08 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-05-22 11:26:08 +0000 |
| commit | e8a08bb3a507810d75a4991408c31d71dd002064 (patch) | |
| tree | 5bc236b1791b9b63ecc1fd044e2987afd83379d0 /target/linux/adm5120/patches-2.6.28 | |
| parent | 7075440170a3d29bda9f985586a9bcfe5f96dd08 (diff) | |
| download | upstream-e8a08bb3a507810d75a4991408c31d71dd002064.tar.gz upstream-e8a08bb3a507810d75a4991408c31d71dd002064.tar.bz2 upstream-e8a08bb3a507810d75a4991408c31d71dd002064.zip | |
[kernel] generic-2.6: move PCI quirk patch from the adm5120 target into the generic patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15985 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/patches-2.6.28')
| -rw-r--r-- | target/linux/adm5120/patches-2.6.28/202-pci_disable_common_quirks.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/target/linux/adm5120/patches-2.6.28/202-pci_disable_common_quirks.patch b/target/linux/adm5120/patches-2.6.28/202-pci_disable_common_quirks.patch deleted file mode 100644 index a8aa561d04..0000000000 --- a/target/linux/adm5120/patches-2.6.28/202-pci_disable_common_quirks.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/drivers/pci/Kconfig -+++ b/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 ---- a/drivers/pci/quirks.c -+++ b/drivers/pci/quirks.c -@@ -34,6 +34,7 @@ int pcie_mch_quirk; - EXPORT_SYMBOL(pcie_mch_quirk); - - #ifdef CONFIG_PCI_QUIRKS -+#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. -@@ -1580,7 +1581,9 @@ 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 */ - -+#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) - { -@@ -1972,6 +1975,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT - quirk_msi_intx_disable_bug); - - #endif /* CONFIG_PCI_MSI */ -+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ - - static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end) - { |