aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/810-pci_disable_common_quirks.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-11-29 10:30:58 +0000
committerLuka Perkov <luka@openwrt.org>2014-11-29 10:30:58 +0000
commit15a48a38b8ea48596667ef340a7d263fe74fbaa0 (patch)
treeb7feb2c8ab6c41b9e49a14d5202072ae11f53e49 /target/linux/generic/patches-3.14/810-pci_disable_common_quirks.patch
parent5685e23f48e1f2c4ce44b3328a431b79bab85e41 (diff)
downloadupstream-15a48a38b8ea48596667ef340a7d263fe74fbaa0.tar.gz
upstream-15a48a38b8ea48596667ef340a7d263fe74fbaa0.tar.bz2
upstream-15a48a38b8ea48596667ef340a7d263fe74fbaa0.zip
kernel: update 3.14 to 3.14.25
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43427 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/810-pci_disable_common_quirks.patch')
-rw-r--r--target/linux/generic/patches-3.14/810-pci_disable_common_quirks.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.14/810-pci_disable_common_quirks.patch b/target/linux/generic/patches-3.14/810-pci_disable_common_quirks.patch
index e4becb38d8..0ecc7053f9 100644
--- a/target/linux/generic/patches-3.14/810-pci_disable_common_quirks.patch
+++ b/target/linux/generic/patches-3.14/810-pci_disable_common_quirks.patch
@@ -15,7 +15,7 @@
default y
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
-@@ -40,6 +40,7 @@ static void quirk_mmio_always_on(struct
+@@ -41,6 +41,7 @@ static void quirk_mmio_always_on(struct
DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on);
@@ -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.
-@@ -2860,6 +2861,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -2880,6 +2881,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
-@@ -2916,6 +2918,8 @@ static void fixup_debug_report(struct pc
+@@ -2936,6 +2938,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).
-@@ -2951,6 +2955,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
+@@ -2971,6 +2975,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);