summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2016-05-26 19:57:44 +0300
committerDoug Ledford <dledford@redhat.com>2016-05-26 19:59:34 +0300
commit7a226f9c32b0481b0744e2726cd7f8349b866af5 (patch)
tree890872e452d463a3d6ee90110c4b452c14dc3bea
parentb40f4757daa1b28e586fddad76638c98e2edfc34 (diff)
downloadlinux-7a226f9c32b0481b0744e2726cd7f8349b866af5.tar.xz
staging/rdma: Remove the entire rdma subdirectory of staging
This is no longer in use. Remove it. Signed-off-by: Doug Ledford <dledford@redhat.com>
-rw-r--r--MAINTAINERS1
-rw-r--r--drivers/staging/Kconfig2
-rw-r--r--drivers/staging/Makefile1
-rw-r--r--drivers/staging/rdma/Kconfig25
-rw-r--r--drivers/staging/rdma/Makefile1
5 files changed, 0 insertions, 30 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 98234560cfdc..78afefeaa979 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5621,7 +5621,6 @@ 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 5bac28a3944e..7c197d1a1231 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -66,8 +66,6 @@ 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 a954242b0f2c..a470c7276142 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -23,7 +23,6 @@ obj-$(CONFIG_FB_XGI) += xgifb/
obj-$(CONFIG_USB_EMXX) += emxx_udc/
obj-$(CONFIG_SPEAKUP) += speakup/
obj-$(CONFIG_MFD_NVEC) += nvec/
-obj-$(CONFIG_STAGING_RDMA) += rdma/
obj-$(CONFIG_ANDROID) += android/
obj-$(CONFIG_STAGING_BOARD) += board/
obj-$(CONFIG_LTE_GDM724X) += gdm724x/
diff --git a/drivers/staging/rdma/Kconfig b/drivers/staging/rdma/Kconfig
deleted file mode 100644
index 2c5b0188ebbf..000000000000
--- a/drivers/staging/rdma/Kconfig
+++ /dev/null
@@ -1,25 +0,0 @@
-menuconfig STAGING_RDMA
- tristate "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
deleted file mode 100644
index b5e94f169101..000000000000
--- a/drivers/staging/rdma/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-# Entries for RDMA_STAGING tree