fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / infiniband / hw / ipath / Kconfig

diff --git a/drivers/infiniband/hw/ipath/Kconfig b/drivers/infiniband/hw/ipath/Kconfig
index 1db9489..90c1454 100644 (file)
--- a/drivers/infiniband/hw/ipath/Kconfig
+++ b/drivers/infiniband/hw/ipath/Kconfig
@@ -1,16 +1,9 @@
-config IPATH_CORE
-       tristate "QLogic InfiniPath Driver"
-       depends on 64BIT && PCI_MSI && NET
-       ---help---
-       This is a low-level driver for QLogic InfiniPath host channel
-       adapters (HCAs) based on the HT-400 and PE-800 chips.
-
 config INFINIBAND_IPATH
-       tristate "QLogic InfiniPath Verbs Driver"
-       depends on IPATH_CORE && INFINIBAND
+       tristate "QLogic InfiniPath Driver"
+       depends on (PCI_MSI || HT_IRQ) && 64BIT && INFINIBAND && NET
        ---help---
-       This is a driver that provides InfiniBand verbs support for
-       QLogic InfiniPath host channel adapters (HCAs).  This
-       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).
+       This is a driver for QLogic InfiniPath host channel adapters,
+       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).