diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2011-08-09 12:19:43 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2011-08-09 12:19:43 +0000 |
| commit | cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4 (patch) | |
| tree | f0d9e62c746434dde7a45ed0debd3eb94b92dc65 /target/linux/generic/patches-3.1/810-pci_disable_common_quirks.patch | |
| parent | a5f2fd63598414246a497e08a4433a0116f2f606 (diff) | |
| download | upstream-cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4.tar.gz upstream-cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4.tar.bz2 upstream-cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4.zip | |
linux: generic: add support for 3.1-rc1
SVN-Revision: 27940
Diffstat (limited to 'target/linux/generic/patches-3.1/810-pci_disable_common_quirks.patch')
| -rw-r--r-- | target/linux/generic/patches-3.1/810-pci_disable_common_quirks.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.1/810-pci_disable_common_quirks.patch b/target/linux/generic/patches-3.1/810-pci_disable_common_quirks.patch new file mode 100644 index 0000000000..6d3b18b07e --- /dev/null +++ b/target/linux/generic/patches-3.1/810-pci_disable_common_quirks.patch @@ -0,0 +1,43 @@ +--- a/drivers/pci/Kconfig ++++ b/drivers/pci/Kconfig +@@ -62,6 +62,12 @@ config XEN_PCIDEV_FE_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 +@@ -104,6 +104,7 @@ static void __devinit quirk_mmio_always_ + } + DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, quirk_mmio_always_on); + ++#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. +@@ -1989,7 +1990,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) + { +@@ -2665,6 +2668,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT + quirk_msi_intx_disable_bug); + + #endif /* CONFIG_PCI_MSI */ ++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ + + /* Allow manual resource allocation for PCI hotplug bridges + * via pci=hpmemsize=nnM and pci=hpiosize=nnM parameters. For |