upgrade orion and sync to 2.6.26-rc6
[openwrt.git] / target / linux / adm5120 / patches / 202-pci_disable_common_quirks.patch
1 --- a/drivers/pci/Kconfig
2 +++ b/drivers/pci/Kconfig
3 @@ -42,6 +42,12 @@
4
5 When in doubt, say N.
6
7 +config PCI_DISABLE_COMMON_QUIRKS
8 + bool "PCI disable common quirks"
9 + depends on PCI
10 + help
11 + If you don't know what to do here, say N.
12 +
13 config HT_IRQ
14 bool "Interrupts on hypertransport devices"
15 default y
16 --- a/drivers/pci/quirks.c
17 +++ b/drivers/pci/quirks.c
18 @@ -23,6 +23,7 @@
19 #include <linux/acpi.h>
20 #include "pci.h"
21
22 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
23 /* The Mellanox Tavor device gives false positive parity errors
24 * Mark this device with a broken_parity_status, to allow
25 * PCI scanning code to "skip" this now blacklisted device.
26 @@ -1480,6 +1481,7 @@
27 }
28 }
29 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
30 +#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
31
32 static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end)
33 {
34 @@ -1543,6 +1545,7 @@
35 }
36 EXPORT_SYMBOL(pci_fixup_device);
37
38 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
39 /* Enable 1k I/O space granularity on the Intel P64H2 */
40 static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
41 {
42 @@ -1756,3 +1759,4 @@
43 quirk_msi_intx_disable_bug);
44
45 #endif /* CONFIG_PCI_MSI */
46 +#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
This page took 0.058943 seconds and 5 git commands to generate.