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>

diff --git a/MAINTAINERS b/MAINTAINERS
index 98234560cfdce42e877fc198df51611288b40485..78afefeaa9795bc5f5d8915f30d84562c02b6108 100644 (file)
--- 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 5bac28a3944e2da485d191c83bc0a0bf637f23ba..7c197d1a123169c48713f298d2abb84f5c2c96c5 100644 (file)
--- 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 a954242b0f2c2036dff9f6180b8491505d9f90e0..a470c72761422ba9f314207ead2e922b16e02861 100644 (file)
--- 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 (file)
index 2c5b018..0000000
--- 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 (file)
index b5e94f1..0000000
--- a/drivers/staging/rdma/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-# Entries for RDMA_STAGING tree