aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.34/030-pci_disable_common_quirks.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-08-01 12:41:09 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-08-01 12:41:09 +0000
commit03699ac8758aa814176bcd1a55b441ddd8431b92 (patch)
treee19c7fbfcdafe9e460306c91cecd9f84cdaf1457 /target/linux/generic/patches-2.6.34/030-pci_disable_common_quirks.patch
parentf839bab3fd375bae7c763ca4f1f5521551b6cb31 (diff)
downloadmaster-187ad058-03699ac8758aa814176bcd1a55b441ddd8431b92.tar.gz
master-187ad058-03699ac8758aa814176bcd1a55b441ddd8431b92.tar.bz2
master-187ad058-03699ac8758aa814176bcd1a55b441ddd8431b92.zip
[kernel] refresh 2.6.34 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22451 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.34/030-pci_disable_common_quirks.patch')
-rw-r--r--target/linux/generic/patches-2.6.34/030-pci_disable_common_quirks.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-2.6.34/030-pci_disable_common_quirks.patch b/target/linux/generic/patches-2.6.34/030-pci_disable_common_quirks.patch
index 0cf19789ae..4b2a839ab9 100644
--- a/target/linux/generic/patches-2.6.34/030-pci_disable_common_quirks.patch
+++ b/target/linux/generic/patches-2.6.34/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.
-@@ -1901,7 +1902,9 @@ static void __devinit fixup_rev1_53c810(
+@@ -1904,7 +1905,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)
{
-@@ -2551,6 +2554,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -2556,6 +2559,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 */