summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch
diff options
context:
space:
mode:
authoracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-21 08:23:11 +0000
committeracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-21 08:23:11 +0000
commit3f47f267e06942b26cba3bc17f0867f4dd73001e (patch)
tree5583374dc15cbccd72a088e161bfec3dfc6098cc /target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch
parent9cdf3516e5f0beec6aa8b8dd97f9b544b515941d (diff)
linux/generic: refresh 2.6.36 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23560 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch')
-rw-r--r--target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch b/target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch
index 282ef6881..c5e14d7aa 100644
--- a/target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch
+++ b/target/linux/generic/patches-2.6.36/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.
-@@ -1923,7 +1924,9 @@ static void __devinit fixup_rev1_53c810(
+@@ -1943,7 +1944,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)
{
-@@ -2596,6 +2599,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -2616,6 +2619,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 */