diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2009-05-22 11:26:08 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2009-05-22 11:26:08 +0000 |
commit | e8a08bb3a507810d75a4991408c31d71dd002064 (patch) | |
tree | 5bc236b1791b9b63ecc1fd044e2987afd83379d0 /target/linux/generic-2.6/patches-2.6.30 | |
parent | 7075440170a3d29bda9f985586a9bcfe5f96dd08 (diff) | |
download | master-187ad058-e8a08bb3a507810d75a4991408c31d71dd002064.tar.gz master-187ad058-e8a08bb3a507810d75a4991408c31d71dd002064.tar.bz2 master-187ad058-e8a08bb3a507810d75a4991408c31d71dd002064.zip |
[kernel] generic-2.6: move PCI quirk patch from the adm5120 target into the generic patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15985 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.30/030-pci_disable_common_quirks.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/030-pci_disable_common_quirks.patch b/target/linux/generic-2.6/patches-2.6.30/030-pci_disable_common_quirks.patch new file mode 100644 index 0000000000..cc706b455a --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.30/030-pci_disable_common_quirks.patch @@ -0,0 +1,43 @@ +--- a/drivers/pci/Kconfig ++++ b/drivers/pci/Kconfig +@@ -51,6 +51,12 @@ config PCI_STUB + + When in doubt, say N. + ++config PCI_DISABLE_COMMON_QUIRKS ++ bool "PCI disable common quirks" ++ depends on PCI ++ help ++ If you don't know what to do here, say N. ++ + config HT_IRQ + bool "Interrupts on hypertransport devices" + default y +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -98,6 +98,7 @@ static void __devinit quirk_resource_ali + } + DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_resource_alignment); + ++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS + /* 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. +@@ -1859,7 +1860,9 @@ static void __devinit fixup_rev1_53c810( + } + } + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810); ++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ + ++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS + /* Enable 1k I/O space granularity on the Intel P64H2 */ + static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev) + { +@@ -2463,6 +2466,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x10e7, quirk_i82576_sriov); + + #endif /* CONFIG_PCI_IOV */ ++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ + + static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, + struct pci_fixup *end) |