aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/810-pci_disable_common_quirks.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2016-01-12 20:53:04 +0000
committerHauke Mehrtens <hauke@openwrt.org>2016-01-12 20:53:04 +0000
commit4ba80a0b324d4e4e57f0ee50f89f9a5affc40ce6 (patch)
tree3f4aeaef7819851a11f87cd003d7e02fe17c9189 /target/linux/generic/patches-3.18/810-pci_disable_common_quirks.patch
parent50ff51e118b8c1dc098fd2d26d2235bd1add458c (diff)
downloadmaster-187ad058-4ba80a0b324d4e4e57f0ee50f89f9a5affc40ce6.tar.gz
master-187ad058-4ba80a0b324d4e4e57f0ee50f89f9a5affc40ce6.tar.bz2
master-187ad058-4ba80a0b324d4e4e57f0ee50f89f9a5affc40ce6.zip
kernel/3.18: update to version 3.18.25
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48225 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 b9b3e0aba8..1b7bead486 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.
-@@ -2908,6 +2909,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -2917,6 +2918,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
-@@ -2964,6 +2966,8 @@ static void fixup_debug_report(struct pc
+@@ -2973,6 +2975,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).
-@@ -2998,6 +3002,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
+@@ -3007,6 +3011,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);