diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-06-17 14:30:18 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-06-17 14:30:18 +0000 |
| commit | 13bb189a1500a306e8611b9e734eed8b8a46506e (patch) | |
| tree | 5a28619b0bb967d37ebdb9a0ef0a7a40fa2747cc /target/linux/adm5120/patches/202-pci_disable_common_quirks.patch | |
| parent | 2ccf25789e09a6745270c8976917f4ccd5c68797 (diff) | |
| download | upstream-13bb189a1500a306e8611b9e734eed8b8a46506e.tar.gz upstream-13bb189a1500a306e8611b9e734eed8b8a46506e.tar.bz2 upstream-13bb189a1500a306e8611b9e734eed8b8a46506e.zip | |
switch to 2.6.25.7
SVN-Revision: 11526
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 | 10 |
1 files changed, 5 insertions, 5 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 index 13142add37..25149885a5 100644 --- a/target/linux/adm5120/patches/202-pci_disable_common_quirks.patch +++ b/target/linux/adm5120/patches/202-pci_disable_common_quirks.patch @@ -15,15 +15,15 @@ default y --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -23,6 +23,7 @@ - #include <linux/acpi.h> +@@ -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. -@@ -1480,6 +1481,7 @@ +@@ -1495,6 +1496,7 @@ } } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810); @@ -31,7 +31,7 @@ static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end) { -@@ -1543,6 +1545,7 @@ +@@ -1562,6 +1564,7 @@ } EXPORT_SYMBOL(pci_fixup_device); @@ -39,7 +39,7 @@ /* Enable 1k I/O space granularity on the Intel P64H2 */ static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev) { -@@ -1756,3 +1759,4 @@ +@@ -1875,3 +1878,4 @@ quirk_msi_intx_disable_bug); #endif /* CONFIG_PCI_MSI */ |