aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/810-pci_disable_common_quirks.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-02-14 10:45:12 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-02-14 10:45:12 +0000
commit4893c0c7f734311b70d686362063e5333a86ac17 (patch)
tree4b592c70237f6a0e2e44a60845269ef1a46ebdd9 /target/linux/generic/patches-3.18/810-pci_disable_common_quirks.patch
parent285348e0868ac6d84acb6b3caa45aa9afdb87196 (diff)
downloadupstream-4893c0c7f734311b70d686362063e5333a86ac17.tar.gz
upstream-4893c0c7f734311b70d686362063e5333a86ac17.tar.bz2
upstream-4893c0c7f734311b70d686362063e5333a86ac17.zip
generic: upgrade to 3.18.7
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 44442
Diffstat (limited to 'target/linux/generic/patches-3.18/810-pci_disable_common_quirks.patch')
-rw-r--r--target/linux/generic/patches-3.18/810-pci_disable_common_quirks.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.18/810-pci_disable_common_quirks.patch b/target/linux/generic/patches-3.18/810-pci_disable_common_quirks.patch
index ef811c6fdf..b6c0b38e72 100644
--- a/target/linux/generic/patches-3.18/810-pci_disable_common_quirks.patch
+++ b/target/linux/generic/patches-3.18/810-pci_disable_common_quirks.patch
@@ -23,7 +23,7 @@
/* 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.
-@@ -2871,6 +2872,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -2905,6 +2906,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
@@ -31,7 +31,7 @@
/*
* Ivytown NTB BAR sizes are misreported by the hardware due to an erratum. To
-@@ -2927,6 +2929,8 @@ static void fixup_debug_report(struct pc
+@@ -2961,6 +2963,8 @@ static void fixup_debug_report(struct pc
}
}
@@ -40,7 +40,7 @@
/*
* Some BIOS implementations leave the Intel GPU interrupts enabled,
* even though no one is handling them (f.e. i915 driver is never loaded).
-@@ -2961,6 +2965,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
+@@ -2995,6 +2999,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq);