diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-02-09 10:29:28 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-02-09 10:29:28 +0000 |
| commit | d187aba072246a4b03979b52b63198967cb511e6 (patch) | |
| tree | 0e564d4fff61a6173e95cf1e26ff005dd47a5fa4 /target/linux/adm5120/patches/202-pci_disable_common_quirks.patch | |
| parent | cf02f1c6b20c64b88d51d0d6d5324ea6010583c7 (diff) | |
| download | upstream-d187aba072246a4b03979b52b63198967cb511e6.tar.gz upstream-d187aba072246a4b03979b52b63198967cb511e6.tar.bz2 upstream-d187aba072246a4b03979b52b63198967cb511e6.zip | |
switch to 2.6.24
SVN-Revision: 10427
Diffstat (limited to 'target/linux/adm5120/patches/202-pci_disable_common_quirks.patch')
| -rw-r--r-- | target/linux/adm5120/patches/202-pci_disable_common_quirks.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/target/linux/adm5120/patches/202-pci_disable_common_quirks.patch b/target/linux/adm5120/patches/202-pci_disable_common_quirks.patch new file mode 100644 index 0000000000..2aa86e2b13 --- /dev/null +++ b/target/linux/adm5120/patches/202-pci_disable_common_quirks.patch @@ -0,0 +1,50 @@ +Index: linux-2.6.24/drivers/pci/Kconfig +=================================================================== +--- linux-2.6.24.orig/drivers/pci/Kconfig ++++ linux-2.6.24/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.24/drivers/pci/quirks.c +=================================================================== +--- linux-2.6.24.orig/drivers/pci/quirks.c ++++ linux-2.6.24/drivers/pci/quirks.c +@@ -23,6 +23,7 @@ + #include <linux/acpi.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. +@@ -1479,6 +1480,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) + { +@@ -1542,6 +1544,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) + { +@@ -1755,3 +1758,4 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT + quirk_msi_intx_disable_bug); + + #endif /* CONFIG_PCI_MSI */ ++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ |