diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-07-17 14:10:39 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-07-17 14:10:39 +0000 |
commit | c5ef57706de0ef3e4ede1b404ef43510bb22e6d9 (patch) | |
tree | 2a14f0b332c80242d488f0de7b0c351b00ee9dea /target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch | |
parent | 1d7a6ebc79e71dbc9085efab8205134bc769159b (diff) | |
download | upstream-c5ef57706de0ef3e4ede1b404ef43510bb22e6d9.tar.gz upstream-c5ef57706de0ef3e4ede1b404ef43510bb22e6d9.tar.bz2 upstream-c5ef57706de0ef3e4ede1b404ef43510bb22e6d9.zip |
kernel: refresh patches
SVN-Revision: 22252
Diffstat (limited to 'target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch b/target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch index 0cf19789ae..ad754decc5 100644 --- a/target/linux/generic/patches-2.6.35/030-pci_disable_common_quirks.patch +++ b/target/linux/generic/patches-2.6.35/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. -@@ -1901,7 +1902,9 @@ static void __devinit fixup_rev1_53c810( +@@ -1904,7 +1905,9 @@ static void __devinit fixup_rev1_53c810( } } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810); @@ -33,11 +33,11 @@ /* Enable 1k I/O space granularity on the Intel P64H2 */ static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev) { -@@ -2551,6 +2554,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I +@@ -2556,6 +2559,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 */ +#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ - /* - * This is a quirk for the Ricoh MMC controller found as a part of + /* Allow manual resource allocation for PCI hotplug bridges + * via pci=hpmemsize=nnM and pci=hpiosize=nnM parameters. For |