summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/ipath/Kconfig
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@pathscale.com>2006-08-25 11:24:31 -0700
committerRoland Dreier <rolandd@cisco.com>2006-09-22 15:22:30 -0700
commitb1c1b6a30eac88665a35a207cc5e6233090b9d65 (patch)
tree7f2351404d45a48688e3cc2be355d2fb016e4b18 /drivers/infiniband/hw/ipath/Kconfig
parent367fe711c5dc85dbc3265cf01e34d4d6fbd55f06 (diff)
downloadop-kernel-dev-b1c1b6a30eac88665a35a207cc5e6233090b9d65.zip
op-kernel-dev-b1c1b6a30eac88665a35a207cc5e6233090b9d65.tar.gz
IB/ipath: merge ipath_core and ib_ipath drivers
There is little point in keeping the two drivers separate, so we are merging them. Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/hw/ipath/Kconfig')
-rw-r--r--drivers/infiniband/hw/ipath/Kconfig21
1 files changed, 7 insertions, 14 deletions
diff --git a/drivers/infiniband/hw/ipath/Kconfig b/drivers/infiniband/hw/ipath/Kconfig
index 1db9489..574a678 100644
--- 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 && 64BIT && INFINIBAND
---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).
OpenPOWER on IntegriCloud