diff options
author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-08-29 14:35:23 +0000 |
---|---|---|
committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-08-29 14:35:23 +0000 |
commit | 206e5f313e425c2b727b64a023a62c1f3de59b72 (patch) | |
tree | d7d49f33d5b291ac9f72b066866fdc293cf47dc7 /target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch | |
parent | 28d7de48b8c1150b5d72da89a9fb51f271843579 (diff) | |
download | upstream-206e5f313e425c2b727b64a023a62c1f3de59b72.tar.gz upstream-206e5f313e425c2b727b64a023a62c1f3de59b72.tar.bz2 upstream-206e5f313e425c2b727b64a023a62c1f3de59b72.zip |
linux/generic: add kernel 2.6.36 preliminary support
SVN-Revision: 22832
Diffstat (limited to 'target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch b/target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch new file mode 100644 index 0000000000..0f4789a704 --- /dev/null +++ b/target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch @@ -0,0 +1,43 @@ +--- a/drivers/pci/Kconfig ++++ b/drivers/pci/Kconfig +@@ -40,6 +40,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 +@@ -91,6 +91,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. +@@ -1904,7 +1905,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) + { +@@ -2560,6 +2563,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov); + + #endif /* CONFIG_PCI_IOV */ ++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ + + /* Allow manual resource allocation for PCI hotplug bridges + * via pci=hpmemsize=nnM and pci=hpiosize=nnM parameters. For |