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
mariux64 · Jan 6, 2007 · 4497fe1 · 4497fe1
2 parents f87c8e8 + fd8d4b1
commit 4497fe1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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