aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.32/030-pci_disable_common_quirks.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-07-29 17:20:25 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-07-29 17:20:25 +0000
commit6fa5b6c5558eda233f1a1b6362f77c4b1696f93d (patch)
tree377935a1f4c3812afd5346847858a659864bcb32 /target/linux/generic/patches-2.6.32/030-pci_disable_common_quirks.patch
parent1197bf389b501f5af5735d1ab7fc887149a03af0 (diff)
downloadupstream-6fa5b6c5558eda233f1a1b6362f77c4b1696f93d.tar.gz
upstream-6fa5b6c5558eda233f1a1b6362f77c4b1696f93d.tar.bz2
upstream-6fa5b6c5558eda233f1a1b6362f77c4b1696f93d.zip
target/linux: refresh kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22413 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.32/030-pci_disable_common_quirks.patch')
-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 cd08ea14f7..2854428e18 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.
-@@ -1884,7 +1885,9 @@ static void __devinit fixup_rev1_53c810(
+@@ -1887,7 +1888,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)
{
-@@ -2516,6 +2519,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -2522,6 +2525,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 */