aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.34/030-pci_disable_common_quirks.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2011-03-13 17:13:11 +0000
committerHauke Mehrtens <hauke@openwrt.org>2011-03-13 17:13:11 +0000
commitcb96d8a00d470b67b83020b069ef45eb27f36709 (patch)
treeb6a1b20795e47fc1d3a861fda103261a6fcb3f18 /target/linux/generic/patches-2.6.34/030-pci_disable_common_quirks.patch
parent1968a3c5fd3a54aa60e98752b1439199b12fba3d (diff)
downloadupstream-cb96d8a00d470b67b83020b069ef45eb27f36709.tar.gz
upstream-cb96d8a00d470b67b83020b069ef45eb27f36709.tar.bz2
upstream-cb96d8a00d470b67b83020b069ef45eb27f36709.zip
kernel: update to kernel version 2.6.34.8
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26125 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 945255b7f1..2f2b16c83e 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.
-@@ -1904,7 +1905,9 @@ static void __devinit fixup_rev1_53c810(
+@@ -1924,7 +1925,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)
{
-@@ -2560,6 +2563,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -2580,6 +2583,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 */