aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-11-03 12:28:45 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-11-03 12:28:45 -0800
commita0d2db26582a67b61f883d1469e561fbdef28419 (patch)
treee8a4a0bdd1f12fd127d132f1901cee813b06517d /drivers
parentced3985faebc232deec0dd9cc375cb5a43d18391 (diff)
parentbb44c308ee37c14ab63251e27d6d8b4dc73a10a4 (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: 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/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index ecc50db8585..5f1b9f58070 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