aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-11-15 14:24:43 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-11-15 14:24:43 +0000
commit68bf194ee6bc8fa88c67edbb6ead3d289ce38703 (patch)
treec87ddf83db834f67ef60a3b1a8669e1f5fcdeba8 /target/linux/generic
parent3c027c784e18e2d2a6a17591ec9e0cd44e695655 (diff)
downloadupstream-68bf194ee6bc8fa88c67edbb6ead3d289ce38703.tar.gz
upstream-68bf194ee6bc8fa88c67edbb6ead3d289ce38703.tar.bz2
upstream-68bf194ee6bc8fa88c67edbb6ead3d289ce38703.zip
refresh 2.6.32 patches
SVN-Revision: 24005
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-2.6.32/030-pci_disable_common_quirks.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-2.6.32/030-pci_disable_common_quirks.patch b/target/linux/generic/patches-2.6.32/030-pci_disable_common_quirks.patch
index 9ecc673562..7572e6f5db 100644
--- a/target/linux/generic/patches-2.6.32/030-pci_disable_common_quirks.patch
+++ b/target/linux/generic/patches-2.6.32/030-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.
-@@ -1887,7 +1888,9 @@ static void __devinit fixup_rev1_53c810(
+@@ -1907,7 +1908,9 @@ static void __devinit fixup_rev1_53c810(
}
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
@@ -33,7 +33,7 @@
/* Enable 1k I/O space granularity on the Intel P64H2 */
static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
{
-@@ -2526,6 +2529,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -2546,6 +2549,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
#endif /* CONFIG_PCI_IOV */