Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / drivers / pci / Kconfig

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 4d762fc4878cc0d328121185cf80c356a7f4f6b6..f1dd81a1d592eabe12865903211f6d2e5e0b9c95 100644 (file)
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -17,6 +17,31 @@ config PCI_MSI
 
           If you don't know what to do here, say N.
 
+config PCI_MULTITHREAD_PROBE
+       bool "PCI Multi-threaded probe (EXPERIMENTAL)"
+       depends on PCI && EXPERIMENTAL
+       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
+         speedup in boot times on multiprocessor machines, and even a
+         smaller speedup on single processor machines.
+
+         But it can also cause lots of bad things to happen.  A number
+         of PCI drivers cannot properly handle running in this way,
+         some will just not work properly at all, while others might
+         decide to blow up power supplies with a huge load all at once,
+         so use this option at your own risk.
+
+         It is very unwise to use this option if you are not using a
+         boot process that can handle devices being created in any
+         order.  A program that can create persistent block and network
+         device names (like udev) is a good idea if you wish to use
+         this option.
+
+         Again, use this option at your own risk, you have been warned!
+
+         When in doubt, say N.
+
 config PCI_DEBUG
        bool "PCI Debugging"
        depends on PCI && DEBUG_KERNEL
@@ -27,3 +52,11 @@ config PCI_DEBUG
 
          When in doubt, say N.
 
+config HT_IRQ
+       bool "Interrupts on hypertransport devices"
+       default y
+       depends on PCI && X86_LOCAL_APIC && X86_IO_APIC
+       help
+          This allows native hypertransport devices to use interrupts.
+
+          If unsure say Y.