diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-16 09:16:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-16 09:16:20 -0700 |
| commit | 72714841b705a5b9bccf37ee85a62352bee3a3ef (patch) | |
| tree | 9f6f07530326d00c5699590e0ea3be243ebc8fcd /drivers/infiniband/hw/Makefile | |
| parent | 30255100d7c253c82b596a0768235d5865eee2cf (diff) | |
| parent | 447e9a4d27484175a84daaa8e03d35c650f443b7 (diff) | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull rdma driver move from Doug Ledford:
"This is a move only, no functional changes.
I tried to get it in prior to the rc1 release, but we were waiting on
IBM to get back to us that they were OK with the deprecation and
eventual removal of this driver. That OK didn't materialize until
last week, so integration and testing time pushed us beyond the rc1
release.
Summary:
- Move ehca driver to staging/rdma and schedule for deletion"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
IB/ehca: Deprecate driver, move to staging, schedule deletion
Diffstat (limited to 'drivers/infiniband/hw/Makefile')
| -rw-r--r-- | drivers/infiniband/hw/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/Makefile b/drivers/infiniband/hw/Makefile index 1bdb9996d371..aded2a5cc2d5 100644 --- a/drivers/infiniband/hw/Makefile +++ b/drivers/infiniband/hw/Makefile @@ -1,6 +1,5 @@ obj-$(CONFIG_INFINIBAND_MTHCA) += mthca/ obj-$(CONFIG_INFINIBAND_QIB) += qib/ -obj-$(CONFIG_INFINIBAND_EHCA) += ehca/ obj-$(CONFIG_INFINIBAND_CXGB3) += cxgb3/ obj-$(CONFIG_INFINIBAND_CXGB4) += cxgb4/ obj-$(CONFIG_MLX4_INFINIBAND) += mlx4/ |