Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[pandora-kernel.git] / drivers / pci / Kconfig

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index c27e782..3cfb0a3 100644 (file)
--- 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
@@ -27,14 +27,14 @@ config PCI_MULTITHREAD_PROBE
          smaller speedup on single processor machines.
 
          But it can also cause lots of bad things to happen.  A number
-         of PCI drivers can not properly handle running in this way,
+         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 persistant block and network
+         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.
 
@@ -52,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.