Skip to content

Commit 072bf1f

Browse files
Steve Wisedledford
authored andcommitted
RDMA/amso1100: Deprecate the amso1100 driver and move to staging
The HW hasn't been sold since 2005, and the SW has definite bit rot. Its time to remove it. So move it to staging for a few releases and then remove it after that. Signed-off-by: Steve Wise <[email protected]> Signed-off-by: Doug Ledford <[email protected]>
1 parent 6f9b389 commit 072bf1f

28 files changed

+7
-2
lines changed

drivers/infiniband/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ config INFINIBAND_ADDR_TRANS
5757
source "drivers/infiniband/hw/mthca/Kconfig"
5858
source "drivers/infiniband/hw/qib/Kconfig"
5959
source "drivers/infiniband/hw/ehca/Kconfig"
60-
source "drivers/infiniband/hw/amso1100/Kconfig"
6160
source "drivers/infiniband/hw/cxgb3/Kconfig"
6261
source "drivers/infiniband/hw/cxgb4/Kconfig"
6362
source "drivers/infiniband/hw/mlx4/Kconfig"

drivers/infiniband/hw/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
obj-$(CONFIG_INFINIBAND_MTHCA) += mthca/
22
obj-$(CONFIG_INFINIBAND_QIB) += qib/
33
obj-$(CONFIG_INFINIBAND_EHCA) += ehca/
4-
obj-$(CONFIG_INFINIBAND_AMSO1100) += amso1100/
54
obj-$(CONFIG_INFINIBAND_CXGB3) += cxgb3/
65
obj-$(CONFIG_INFINIBAND_CXGB4) += cxgb4/
76
obj-$(CONFIG_MLX4_INFINIBAND) += mlx4/

drivers/staging/rdma/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ menuconfig STAGING_RDMA
2222
# Please keep entries in alphabetic order
2323
if STAGING_RDMA
2424

25+
source "drivers/staging/rdma/amso1100/Kconfig"
26+
2527
source "drivers/staging/rdma/ipath/Kconfig"
2628

2729
endif

drivers/staging/rdma/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# Entries for RDMA_STAGING tree
2+
obj-$(CONFIG_INFINIBAND_AMSO1100) += amso1100/
23
obj-$(CONFIG_INFINIBAND_IPATH) += ipath/

drivers/staging/rdma/amso1100/TODO

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
7/2015
2+
3+
The amso1100 driver has been deprecated and moved to drivers/staging.
4+
It will be removed in the 4.6 merge window.

0 commit comments

Comments
 (0)