summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/810-pci_disable_common_quirks.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic/patches-3.6/810-pci_disable_common_quirks.patch')
-rw-r--r--target/linux/generic/patches-3.6/810-pci_disable_common_quirks.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic/patches-3.6/810-pci_disable_common_quirks.patch b/target/linux/generic/patches-3.6/810-pci_disable_common_quirks.patch
index 480215718..85e3c97b8 100644
--- a/target/linux/generic/patches-3.6/810-pci_disable_common_quirks.patch
+++ b/target/linux/generic/patches-3.6/810-pci_disable_common_quirks.patch
@@ -1,6 +1,6 @@
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
-@@ -51,6 +51,12 @@ config XEN_PCIDEV_FRONTEND
+@@ -64,6 +64,12 @@ config XEN_PCIDEV_FRONTEND
The PCI device frontend driver allows the kernel to import arbitrary
PCI devices from a PCI backend to support PCI driver domains.
@@ -15,15 +15,15 @@
default y
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
-@@ -105,6 +105,7 @@ static void __devinit quirk_mmio_always_
- }
- DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, quirk_mmio_always_on);
+@@ -44,6 +44,7 @@ static void __devinit quirk_mmio_always_
+ DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID,
+ PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on);
+#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.
-@@ -1990,7 +1991,9 @@ static void __devinit fixup_rev1_53c810(
+@@ -1933,7 +1934,9 @@ static void __devinit fixup_rev1_53c810(
}
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
@@ -33,9 +33,9 @@
/* Enable 1k I/O space granularity on the Intel P64H2 */
static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
{
-@@ -2666,6 +2669,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT
+@@ -2605,6 +2608,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATTANSIC, 0x1083,
quirk_msi_intx_disable_bug);
-
#endif /* CONFIG_PCI_MSI */
+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */