diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-27 01:46:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-27 01:46:15 +0200 |
| commit | 5b79c2af667c0e2684f2a6dbf6439074b78f490c (patch) | |
| tree | efda2b94317c914fef0bfb25fe5ada9e253d5415 /drivers/infiniband/ulp/srpt/Kconfig | |
| parent | net: dsa: dsa_loop: Make dynamic debugging helpful (diff) | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| download | linux-5b79c2af667c0e2684f2a6dbf6439074b78f490c.tar.xz linux-5b79c2af667c0e2684f2a6dbf6439074b78f490c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of easy overlapping changes in the confict
resolutions here.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/infiniband/ulp/srpt/Kconfig')
| -rw-r--r-- | drivers/infiniband/ulp/srpt/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/srpt/Kconfig b/drivers/infiniband/ulp/srpt/Kconfig index fb8b7182f05e..25bf6955b6d0 100644 --- a/drivers/infiniband/ulp/srpt/Kconfig +++ b/drivers/infiniband/ulp/srpt/Kconfig @@ -1,6 +1,6 @@ config INFINIBAND_SRPT tristate "InfiniBand SCSI RDMA Protocol target support" - depends on INFINIBAND && INFINIBAND_ADDR_TRANS && TARGET_CORE + depends on INFINIBAND_ADDR_TRANS && TARGET_CORE ---help--- Support for the SCSI RDMA Protocol (SRP) Target driver. The |