diff options
author | Doug Ledford <dledford@redhat.com> | 2016-05-26 12:57:44 -0400 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2016-05-26 12:59:34 -0400 |
commit | 7a226f9c32b0481b0744e2726cd7f8349b866af5 (patch) | |
tree | 890872e452d463a3d6ee90110c4b452c14dc3bea | |
parent | b40f4757daa1b28e586fddad76638c98e2edfc34 (diff) |
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-- | 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, 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 | |||
5621 | S: Supported | 5621 | S: Supported |
5622 | F: Documentation/infiniband/ | 5622 | F: Documentation/infiniband/ |
5623 | F: drivers/infiniband/ | 5623 | F: drivers/infiniband/ |
5624 | F: drivers/staging/rdma/ | ||
5625 | F: include/uapi/linux/if_infiniband.h | 5624 | F: include/uapi/linux/if_infiniband.h |
5626 | F: include/uapi/rdma/ | 5625 | F: include/uapi/rdma/ |
5627 | F: include/rdma/ | 5626 | 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" | |||
66 | 66 | ||
67 | source "drivers/staging/media/Kconfig" | 67 | source "drivers/staging/media/Kconfig" |
68 | 68 | ||
69 | source "drivers/staging/rdma/Kconfig" | ||
70 | |||
71 | source "drivers/staging/android/Kconfig" | 69 | source "drivers/staging/android/Kconfig" |
72 | 70 | ||
73 | source "drivers/staging/board/Kconfig" | 71 | 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/ | |||
23 | obj-$(CONFIG_USB_EMXX) += emxx_udc/ | 23 | obj-$(CONFIG_USB_EMXX) += emxx_udc/ |
24 | obj-$(CONFIG_SPEAKUP) += speakup/ | 24 | obj-$(CONFIG_SPEAKUP) += speakup/ |
25 | obj-$(CONFIG_MFD_NVEC) += nvec/ | 25 | obj-$(CONFIG_MFD_NVEC) += nvec/ |
26 | obj-$(CONFIG_STAGING_RDMA) += rdma/ | ||
27 | obj-$(CONFIG_ANDROID) += android/ | 26 | obj-$(CONFIG_ANDROID) += android/ |
28 | obj-$(CONFIG_STAGING_BOARD) += board/ | 27 | obj-$(CONFIG_STAGING_BOARD) += board/ |
29 | obj-$(CONFIG_LTE_GDM724X) += gdm724x/ | 28 | 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 @@ | |||
1 | menuconfig STAGING_RDMA | ||
2 | tristate "RDMA staging drivers" | ||
3 | depends on INFINIBAND | ||
4 | depends on PCI || BROKEN | ||
5 | depends on HAS_IOMEM | ||
6 | depends on NET | ||
7 | depends on INET | ||
8 | default n | ||
9 | ---help--- | ||
10 | This option allows you to select a number of RDMA drivers that | ||
11 | fall into one of two categories: deprecated drivers being held | ||
12 | here before finally being removed or new drivers that still need | ||
13 | some work before being moved to the normal RDMA driver area. | ||
14 | |||
15 | If you wish to work on these drivers, to help improve them, or | ||
16 | to report problems you have with them, please use the | ||
17 | linux-rdma@vger.kernel.org mailing list. | ||
18 | |||
19 | If in doubt, say N here. | ||
20 | |||
21 | |||
22 | # Please keep entries in alphabetic order | ||
23 | if STAGING_RDMA | ||
24 | |||
25 | 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 @@ | |||
1 | # Entries for RDMA_STAGING tree | ||