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 30294127a0aa90484b907c235d4424ee773336b0..f1dd81a1d592eabe12865903211f6d2e5e0b9c95 100644 (file)
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -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.
 
@@ -55,7 +55,7 @@ config PCI_DEBUG
 config HT_IRQ
        bool "Interrupts on hypertransport devices"
        default y
-       depends on X86_LOCAL_APIC && X86_IO_APIC
+       depends on PCI && X86_LOCAL_APIC && X86_IO_APIC
        help
           This allows native hypertransport devices to use interrupts.