summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2007-01-06 11:10:37 +0300
committerLinus Torvalds <torvalds@woody.osdl.org>2007-01-06 11:10:37 +0300
commit4497fe1e88cdee984925c2b477e5c73379e00620 (patch)
tree751a77ef872e242229c3c9968799d7baed0ac952
parentf87c8e80545fd277f69521ef859c3e71c6af5656 (diff)
parentfd8d4b11354a8a33ef61b06fa64880c2c6d25ae4 (diff)
downloadlinux-sunxi-4497fe1e88cdee984925c2b477e5c73379e00620.tar.xz
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/Kconfig2
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
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