diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-04-03 13:59:07 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-04-03 13:59:07 +0000 |
| commit | 50c743e79ee843bf44b1ab07bd561c9354ace928 (patch) | |
| tree | 0a8b04a22c227e7a4c6c84a71e3d0428fd4e2851 /target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch | |
| parent | 0301e0707408c3497dcb12840c8658d64392e08a (diff) | |
| download | upstream-50c743e79ee843bf44b1ab07bd561c9354ace928.tar.gz upstream-50c743e79ee843bf44b1ab07bd561c9354ace928.tar.bz2 upstream-50c743e79ee843bf44b1ab07bd561c9354ace928.zip | |
kernel: Update to version 2.6.37.6
Thank you Peter Wagner for the patch
SVN-Revision: 26441
Diffstat (limited to 'target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch b/target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch index a951437102..4627986390 100644 --- a/target/linux/generic/patches-2.6.37/030-pci_disable_common_quirks.patch +++ b/target/linux/generic/patches-2.6.37/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. -@@ -1944,7 +1945,9 @@ static void __devinit fixup_rev1_53c810( +@@ -1989,7 +1990,9 @@ static void __devinit fixup_rev1_53c810( } } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810); @@ -33,10 +33,10 @@ /* Enable 1k I/O space granularity on the Intel P64H2 */ static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev) { -@@ -2669,6 +2672,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov); +@@ -2662,6 +2665,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT + quirk_msi_intx_disable_bug); - #endif /* CONFIG_PCI_IOV */ + #endif /* CONFIG_PCI_MSI */ +#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ /* Allow manual resource allocation for PCI hotplug bridges |