commit 4497fe1e88cdee984925c2b477e5c73379e00620
author Linus Torvalds <torvalds@woody.osdl.org> Sat Jan 06 00:10:37 2007 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> Sat Jan 06 00:10:37 2007 -0800
tree 751a77ef872e242229c3c9968799d7baed0ac952
parent f87c8e80545fd277f69521ef859c3e71c6af5656
parent fd8d4b11354a8a33ef61b06fa64880c2c6d25ae4

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

drivers/pci/Kconfig

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index f1dd81a..3cfb0a3 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -19,7 +19,7 @@
 
 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