Commit 06cc8508 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Roland Dreier
Browse files

IB: Use menuconfig for InfiniBand menu 



Change Kconfig objects from "menu, config" into "menuconfig" so
that the user can disable the whole feature without having to
enter the menu first.

Signed-off-by: default avatarJan Engelhardt <jengelh@gmx.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 6abb6ea8

drivers/infiniband/Kconfig

+7 −8
Original line number Diff line number Diff line 
menu "InfiniBand support"

	depends on HAS_IOMEM



config INFINIBAND

	depends on PCI || BROKEN

menuconfig INFINIBAND

	tristate "InfiniBand support"

	depends on PCI || BROKEN

	depends on HAS_IOMEM

	---help---

	  Core support for InfiniBand (IB).  Make sure to also select

	  any protocols you wish to use as well as drivers for your

	  InfiniBand hardware.



if INFINIBAND



config INFINIBAND_USER_MAD

	tristate "InfiniBand userspace MAD support"

	depends on INFINIBAND
@@ -20,7 +20,6 @@ config INFINIBAND_USER_MAD 


config INFINIBAND_USER_ACCESS

	tristate "InfiniBand userspace access (verbs and CM)"

	depends on INFINIBAND

	---help---

	  Userspace InfiniBand access support.  This enables the

	  kernel side of userspace verbs and the userspace
@@ -37,7 +36,7 @@ config INFINIBAND_USER_MEM 


config INFINIBAND_ADDR_TRANS

	bool

	depends on INFINIBAND && INET

	depends on INET

	default y



source "drivers/infiniband/hw/mthca/Kconfig"
@@ -54,4 +53,4 @@ source "drivers/infiniband/ulp/srp/Kconfig" 


source "drivers/infiniband/ulp/iser/Kconfig"



endmenu
 
endif # INFINIBAND

drivers/infiniband/hw/amso1100/Kconfig

+1 −1
Original line number Diff line number Diff line 
config INFINIBAND_AMSO1100

	tristate "Ammasso 1100 HCA support"

	depends on PCI && INET && INFINIBAND

	depends on PCI && INET

	---help---

	  This is a low-level driver for the Ammasso 1100 host

	  channel adapter (HCA).

drivers/infiniband/hw/cxgb3/Kconfig

+1 −1
Original line number Diff line number Diff line 
config INFINIBAND_CXGB3

	tristate "Chelsio RDMA Driver"

	depends on CHELSIO_T3 && INFINIBAND && INET

	depends on CHELSIO_T3 && INET

	select GENERIC_ALLOCATOR

	---help---

	  This is an iWARP/RDMA driver for the Chelsio T3 1GbE and

drivers/infiniband/hw/ehca/Kconfig

+1 −1
Original line number Diff line number Diff line 
config INFINIBAND_EHCA

	tristate "eHCA support"

	depends on IBMEBUS && INFINIBAND

	depends on IBMEBUS

	---help---

	This driver supports the IBM pSeries eHCA InfiniBand adapter.

drivers/infiniband/hw/ipath/Kconfig

+1 −1
Original line number Diff line number Diff line 
config INFINIBAND_IPATH

	tristate "QLogic InfiniPath Driver"

	depends on (PCI_MSI || HT_IRQ) && 64BIT && INFINIBAND && NET

	depends on (PCI_MSI || HT_IRQ) && 64BIT && NET

	---help---

	This is a driver for QLogic InfiniPath host channel adapters,

	including InfiniBand verbs support.  This driver allows these