diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-06 03:10:37 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-06 03:10:37 -0500 |
| commit | 4497fe1e88cdee984925c2b477e5c73379e00620 (patch) | |
| tree | 751a77ef872e242229c3c9968799d7baed0ac952 | |
| parent | f87c8e80545fd277f69521ef859c3e71c6af5656 (diff) | |
| parent | fd8d4b11354a8a33ef61b06fa64880c2c6d25ae4 (diff) | |
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:
[PATCH] PCI: disable PCI_MULTITHREAD_PROBE
| -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 f1dd81a1d592..3cfb0a3575e6 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig | |||
| @@ -19,7 +19,7 @@ config PCI_MSI | |||
| 19 | 19 | ||
| 20 | config PCI_MULTITHREAD_PROBE | 20 | config PCI_MULTITHREAD_PROBE |
| 21 | bool "PCI Multi-threaded probe (EXPERIMENTAL)" | 21 | bool "PCI Multi-threaded probe (EXPERIMENTAL)" |
| 22 | depends on PCI && EXPERIMENTAL | 22 | depends on PCI && EXPERIMENTAL && BROKEN |
| 23 | help | 23 | help |
| 24 | Say Y here if you want the PCI core to spawn a new thread for | 24 | Say Y here if you want the PCI core to spawn a new thread for |
| 25 | every PCI device that is probed. This can cause a huge | 25 | every PCI device that is probed. This can cause a huge |