diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-10-18 15:14:55 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-10-18 15:14:55 +0000 |
| commit | 39111df10bcc92d6028cdc3884eea1dc31ceb9ff (patch) | |
| tree | f0a1070cfc59607edfc790eafa6d2b673b397a30 /target/linux/adm5120/patches-2.6.23 | |
| parent | 6d6cdb60aad3fb96c00d961e1047ac9e842a2d18 (diff) | |
[adm5120] add kernel config option to disabling common PCI quirks, resync kernel config
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9346 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/patches-2.6.23')
| -rw-r--r-- | target/linux/adm5120/patches-2.6.23/202-pci_disable_common_quirks.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/target/linux/adm5120/patches-2.6.23/202-pci_disable_common_quirks.patch b/target/linux/adm5120/patches-2.6.23/202-pci_disable_common_quirks.patch new file mode 100644 index 000000000..c051abc8a --- /dev/null +++ b/target/linux/adm5120/patches-2.6.23/202-pci_disable_common_quirks.patch @@ -0,0 +1,50 @@ +Index: linux-2.6.23/drivers/pci/Kconfig +================================================================== +--- linux-2.6.23.orig/drivers/pci/Kconfig 2007-10-09 22:31:38.000000000 +0200 ++++ linux-2.6.23/drivers/pci/Kconfig 2007-10-13 14:21:03.000000000 +0200 +@@ -31,6 +31,12 @@ + + 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.23/drivers/pci/quirks.c +================================================================== +--- linux-2.6.23.orig/drivers/pci/quirks.c 2007-10-09 22:31:38.000000000 +0200 ++++ linux-2.6.23/drivers/pci/quirks.c 2007-10-13 14:46:41.000000000 +0200 +@@ -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. +@@ -1510,6 +1511,7 @@ + } + } + 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) + { +@@ -1573,6 +1575,7 @@ + } + 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) + { +@@ -1743,3 +1746,4 @@ + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK804_PCIE, + quirk_nvidia_ck804_msi_ht_cap); + #endif /* CONFIG_PCI_MSI */ ++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ |