diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-03 12:28:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-03 12:28:45 -0800 |
| commit | a0d2db26582a67b61f883d1469e561fbdef28419 (patch) | |
| tree | e8a4a0bdd1f12fd127d132f1901cee813b06517d /drivers | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| parent | PCI: Let PCI_MULTITHREAD_PROBE depend on BROKEN (diff) | |
| download | linux-dev-a0d2db26582a67b61f883d1469e561fbdef28419.tar.xz linux-dev-a0d2db26582a67b61f883d1469e561fbdef28419.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
PCI: Let PCI_MULTITHREAD_PROBE depend on BROKEN
PCI: Revert "PCI: i386/x86_84: disable PCI resource decode on device disable"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index ecc50db8585a..5f1b9f58070e 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -19,7 +19,7 @@ config PCI_MSI config PCI_MULTITHREAD_PROBE bool "PCI Multi-threaded probe (EXPERIMENTAL)" - depends on PCI && EXPERIMENTAL + depends on PCI && EXPERIMENTAL && BROKEN help Say Y here if you want the PCI core to spawn a new thread for every PCI device that is probed. This can cause a huge |