1 --- a/drivers/pci/Kconfig
2 +++ b/drivers/pci/Kconfig
3 @@ -61,6 +61,12 @@ config XEN_PCIDEV_FE_DEBUG
7 +config PCI_DISABLE_COMMON_QUIRKS
8 + bool "PCI disable common quirks"
11 + If you don't know what to do here, say N.
14 bool "Interrupts on hypertransport devices"
16 --- a/drivers/pci/quirks.c
17 +++ b/drivers/pci/quirks.c
18 @@ -104,6 +104,7 @@ static void __devinit quirk_mmio_always_
20 DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, quirk_mmio_always_on);
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 @@ -1944,7 +1945,9 @@ static void __devinit fixup_rev1_53c810(
29 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
30 +#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
32 +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
33 /* Enable 1k I/O space granularity on the Intel P64H2 */
34 static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
36 @@ -2669,6 +2672,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
37 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
39 #endif /* CONFIG_PCI_IOV */
40 +#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
42 /* Allow manual resource allocation for PCI hotplug bridges
43 * via pci=hpmemsize=nnM and pci=hpiosize=nnM parameters. For