diff options
| author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-03-11 12:24:17 +0000 |
|---|---|---|
| committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-03-11 12:24:17 +0000 |
| commit | d138f99bb2325af7821b5ea592bf7e5602ef228e (patch) | |
| tree | 7f77c9b45c329c20826f8a1f1a2875132a56b307 /target/linux/generic-2.6/patches-2.6.34/030-pci_disable_common_quirks.patch | |
| parent | f086ba1d82562fd9f373a737b62353dfccaa7c75 (diff) | |
| download | upstream-d138f99bb2325af7821b5ea592bf7e5602ef228e.tar.gz upstream-d138f99bb2325af7821b5ea592bf7e5602ef228e.tar.bz2 upstream-d138f99bb2325af7821b5ea592bf7e5602ef228e.zip | |
generic-2.6: add 2.6.34 preliminary support (patches)
SVN-Revision: 20140
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.34/030-pci_disable_common_quirks.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.34/030-pci_disable_common_quirks.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.34/030-pci_disable_common_quirks.patch b/target/linux/generic-2.6/patches-2.6.34/030-pci_disable_common_quirks.patch new file mode 100644 index 0000000000..96b4b3387f --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.34/030-pci_disable_common_quirks.patch @@ -0,0 +1,43 @@ +--- a/drivers/pci/Kconfig ++++ b/drivers/pci/Kconfig +@@ -51,6 +51,12 @@ config PCI_STUB + + 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 +@@ -96,6 +96,7 @@ static void __devinit quirk_resource_ali + } + DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_resource_alignment); + ++#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. +@@ -1905,7 +1906,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) + { +@@ -2536,6 +2539,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150d, quirk_i82576_sriov); + + #endif /* CONFIG_PCI_IOV */ ++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ + + static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, + struct pci_fixup *end) |