diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-09-26 13:29:13 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-09-26 13:29:13 +0000 |
| commit | b69ee884f40adfa49cb1d8f2056f337b7632e32c (patch) | |
| tree | 4cee5f09d9414113f16339aaba2f01592ab2836e /target/linux/generic-2.6/patches-2.6.31/030-pci_disable_common_quirks.patch | |
| parent | 545acb046cec10509e4d6b1605773819172477c8 (diff) | |
[kernel] refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17738 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.31/030-pci_disable_common_quirks.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.31/030-pci_disable_common_quirks.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.31/030-pci_disable_common_quirks.patch b/target/linux/generic-2.6/patches-2.6.31/030-pci_disable_common_quirks.patch index 06153e15e..c99ff1d49 100644 --- a/target/linux/generic-2.6/patches-2.6.31/030-pci_disable_common_quirks.patch +++ b/target/linux/generic-2.6/patches-2.6.31/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. -@@ -1866,7 +1867,9 @@ static void __devinit fixup_rev1_53c810( +@@ -1867,7 +1868,9 @@ static void __devinit fixup_rev1_53c810( } } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810); @@ -33,8 +33,8 @@ /* Enable 1k I/O space granularity on the Intel P64H2 */ static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev) { -@@ -2494,6 +2497,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150a, quirk_i82576_sriov); +@@ -2498,6 +2501,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x150d, quirk_i82576_sriov); #endif /* CONFIG_PCI_IOV */ +#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ |