aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.7/810-pci_disable_common_quirks.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-01-12 11:43:08 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-01-12 11:43:08 +0000
commit64cfd63980bac3d95512884d5d30d6d8a3a55c4a (patch)
tree19d1d446fdc8979a9f063ca295d6e8c5ab7f7575 /target/linux/generic/patches-3.7/810-pci_disable_common_quirks.patch
parentc87db17012cc2cec83da79e847fe7283dc6117ad (diff)
downloadupstream-64cfd63980bac3d95512884d5d30d6d8a3a55c4a.tar.gz
upstream-64cfd63980bac3d95512884d5d30d6d8a3a55c4a.tar.bz2
upstream-64cfd63980bac3d95512884d5d30d6d8a3a55c4a.zip
kernel: update linux 3.7 to 3.7.2
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35100 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.7/810-pci_disable_common_quirks.patch')
-rw-r--r--target/linux/generic/patches-3.7/810-pci_disable_common_quirks.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.7/810-pci_disable_common_quirks.patch b/target/linux/generic/patches-3.7/810-pci_disable_common_quirks.patch
index ecbcfb685f..ff1a6b1e98 100644
--- a/target/linux/generic/patches-3.7/810-pci_disable_common_quirks.patch
+++ b/target/linux/generic/patches-3.7/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.
-@@ -2844,6 +2845,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -2847,6 +2848,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 @@
static ktime_t fixup_debug_start(struct pci_dev *dev,
void (*fn)(struct pci_dev *dev))
-@@ -2875,6 +2877,8 @@ static void fixup_debug_report(struct pc
+@@ -2878,6 +2880,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).
-@@ -2909,6 +2913,8 @@ static void __devinit disable_igfx_irq(s
+@@ -2912,6 +2916,8 @@ static void __devinit disable_igfx_irq(s
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);