diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-18 19:29:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-18 19:29:42 -0500 |
| commit | f59e842fc0871cd5baa213dc32e0ce8e5aaf4758 (patch) | |
| tree | 5fc24fe6bc8e49d9d939485f3804a7ef977254c0 /drivers/infiniband/Makefile | |
| parent | 4ba3069fea9f0771dad3f4906b305ab50d5a1b30 (diff) | |
| parent | a42d985bd5b234da8b61347a78dc3057bf7bb94d (diff) | |
Merge branch 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
* 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
ib_srpt: Initial SRP Target merge for v3.3-rc1
Diffstat (limited to 'drivers/infiniband/Makefile')
| -rw-r--r-- | drivers/infiniband/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/Makefile b/drivers/infiniband/Makefile index 9cc7a47d3e67..a3b2d8eac86e 100644 --- a/drivers/infiniband/Makefile +++ b/drivers/infiniband/Makefile | |||
| @@ -10,4 +10,5 @@ obj-$(CONFIG_MLX4_INFINIBAND) += hw/mlx4/ | |||
| 10 | obj-$(CONFIG_INFINIBAND_NES) += hw/nes/ | 10 | obj-$(CONFIG_INFINIBAND_NES) += hw/nes/ |
| 11 | obj-$(CONFIG_INFINIBAND_IPOIB) += ulp/ipoib/ | 11 | obj-$(CONFIG_INFINIBAND_IPOIB) += ulp/ipoib/ |
| 12 | obj-$(CONFIG_INFINIBAND_SRP) += ulp/srp/ | 12 | obj-$(CONFIG_INFINIBAND_SRP) += ulp/srp/ |
| 13 | obj-$(CONFIG_INFINIBAND_SRPT) += ulp/srpt/ | ||
| 13 | obj-$(CONFIG_INFINIBAND_ISER) += ulp/iser/ | 14 | obj-$(CONFIG_INFINIBAND_ISER) += ulp/iser/ |