diff options
author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2018-05-09 22:00:19 +0300 |
---|---|---|
committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2018-05-09 22:00:19 +0300 |
commit | cc1c8445eba5b78f5b719c47572473d7a7caa038 (patch) | |
tree | 3954bcaa641ee362bf06b7aa9197d30a90eb4ca3 /drivers/infiniband/ulp/srp/Kconfig | |
parent | ab460a2e72dabecfdabd45eb7e3ee2d73fc876d4 (diff) | |
parent | 75bc37fefc4471e718ba8e651aa74673d4e0a9eb (diff) | |
download | linux-cc1c8445eba5b78f5b719c47572473d7a7caa038.tar.xz |
Merge tag 'v4.17-rc4' into rpmsg-next
Pick up fixes from rproc-v4.17-1
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers/infiniband/ulp/srp/Kconfig')
-rw-r--r-- | drivers/infiniband/ulp/srp/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/srp/Kconfig b/drivers/infiniband/ulp/srp/Kconfig index c74ee9633041..99db8fe5173a 100644 --- a/drivers/infiniband/ulp/srp/Kconfig +++ b/drivers/infiniband/ulp/srp/Kconfig @@ -1,6 +1,6 @@ config INFINIBAND_SRP tristate "InfiniBand SCSI RDMA Protocol" - depends on SCSI + depends on SCSI && INFINIBAND_ADDR_TRANS select SCSI_SRP_ATTRS ---help--- Support for the SCSI RDMA Protocol over InfiniBand. This |