diff options
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/rdma/Kconfig | 25 | ||||
| -rw-r--r-- | drivers/staging/rdma/Makefile | 1 |
5 files changed, 30 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 569568f6644f..a82aa07366d1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5278,6 +5278,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git S: Supported F: Documentation/infiniband/ F: drivers/infiniband/ +F: drivers/staging/rdma/ F: include/uapi/linux/if_infiniband.h F: include/uapi/rdma/ F: include/rdma/ diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 7f6cae5beb90..936016f74afe 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -74,6 +74,8 @@ source "drivers/staging/nvec/Kconfig" source "drivers/staging/media/Kconfig" +source "drivers/staging/rdma/Kconfig" + source "drivers/staging/android/Kconfig" source "drivers/staging/board/Kconfig" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 347f6477aa3e..c6c44545b94a 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -30,6 +30,7 @@ obj-$(CONFIG_FT1000) += ft1000/ obj-$(CONFIG_SPEAKUP) += speakup/ obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += ste_rmi4/ obj-$(CONFIG_MFD_NVEC) += nvec/ +obj-$(CONFIG_STAGING_RDMA) += rdma/ obj-$(CONFIG_ANDROID) += android/ obj-$(CONFIG_STAGING_BOARD) += board/ obj-$(CONFIG_USB_WPAN_HCD) += ozwpan/ diff --git a/drivers/staging/rdma/Kconfig b/drivers/staging/rdma/Kconfig new file mode 100644 index 000000000000..0bff438ada6f --- /dev/null +++ b/drivers/staging/rdma/Kconfig @@ -0,0 +1,25 @@ +menuconfig STAGING_RDMA + bool "RDMA staging drivers" + depends on INFINIBAND + depends on PCI || BROKEN + depends on HAS_IOMEM + depends on NET + depends on INET + default n + ---help--- + This option allows you to select a number of RDMA drivers that + fall into one of two categories: deprecated drivers being held + here before finally being removed or new drivers that still need + some work before being moved to the normal RDMA driver area. + + If you wish to work on these drivers, to help improve them, or + to report problems you have with them, please use the + linux-rdma@vger.kernel.org mailing list. + + If in doubt, say N here. + + +# Please keep entries in alphabetic order +if STAGING_RDMA + +endif diff --git a/drivers/staging/rdma/Makefile b/drivers/staging/rdma/Makefile new file mode 100644 index 000000000000..b5e94f169101 --- /dev/null +++ b/drivers/staging/rdma/Makefile @@ -0,0 +1 @@ +# Entries for RDMA_STAGING tree |