Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / infiniband / hw / ipath / Kconfig

diff --git a/drivers/infiniband/hw/ipath/Kconfig b/drivers/infiniband/hw/ipath/Kconfig
index 044da58..1d9bb11 100644 (file)
--- a/drivers/infiniband/hw/ipath/Kconfig
+++ b/drivers/infiniband/hw/ipath/Kconfig
@@ -1,9 +1,11 @@
 config INFINIBAND_IPATH
-       tristate "QLogic InfiniPath Driver"
-       depends on (PCI_MSI || HT_IRQ) && 64BIT && NET
+       tristate "QLogic HTX HCA support"
+       depends on 64BIT && NET && HT_IRQ
        ---help---
-       This is a driver for QLogic InfiniPath host channel adapters,
+       This is a driver for the obsolete QLogic Hyper-Transport
+       IB host channel adapter (model QHT7140),
        including InfiniBand verbs support.  This driver allows these
        devices to be used with both kernel upper level protocols such
        as IP-over-InfiniBand as well as with userspace applications
        (in conjunction with InfiniBand userspace access).
+       For QLogic PCIe QLE based cards, use the QIB driver instead.