[backfire] merge r23058, refresh patches
[openwrt-10.03/.git] / target / linux / generic-2.6 / patches-2.6.32 / 030-pci_disable_common_quirks.patch
1 --- a/drivers/pci/Kconfig
2 +++ b/drivers/pci/Kconfig
3 @@ -51,6 +51,12 @@ config PCI_STUB
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 @@ -96,6 +96,7 @@ static void __devinit quirk_resource_ali
19  }
20  DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_resource_alignment);
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 @@ -1887,7 +1888,9 @@ static void __devinit fixup_rev1_53c810(
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 +#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)
35  {
36 @@ -2522,6 +2525,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
37  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
38  
39  #endif /* CONFIG_PCI_IOV */
40 +#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
41  
42  static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,
43                           struct pci_fixup *end)