diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-13 19:19:42 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-13 19:19:42 +0300 |
| commit | ccbf04f24c55ead791dac5df8ddeb1a640fbaad8 (patch) | |
| tree | 8f291886f3f04a5daf9c3727938f20a1db1c06b2 /drivers/infiniband/ulp/iser/Kconfig | |
| parent | 51eb9ab91abc9c384118b1d947e4b99cc2bc5fc5 (diff) | |
| parent | 8c9ea7fe96afb30660673da77853114827fac0ca (diff) | |
| download | linux-ccbf04f24c55ead791dac5df8ddeb1a640fbaad8.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/iser: Add dependency on INFINIBAND_ADDR_TRANS
IPoIB: Do not join broadcast group if interface is brought down
RDMA/nes: Fix for NIPQUAD removal
IPoIB: Fix loss of connectivity after bonding failover on both sides
IB/mlx4: Don't register IB device for adapters with no IB ports
mlx4_core: Fix warning from min()
IB/ehca: spin_lock_irqsave() takes an unsigned long
Diffstat (limited to 'drivers/infiniband/ulp/iser/Kconfig')
| -rw-r--r-- | drivers/infiniband/ulp/iser/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/iser/Kconfig b/drivers/infiniband/ulp/iser/Kconfig index 77dedba829e6..b411c51842da 100644 --- a/drivers/infiniband/ulp/iser/Kconfig +++ b/drivers/infiniband/ulp/iser/Kconfig @@ -1,6 +1,6 @@ config INFINIBAND_ISER tristate "iSCSI Extensions for RDMA (iSER)" - depends on SCSI && INET + depends on SCSI && INET && INFINIBAND_ADDR_TRANS select SCSI_ISCSI_ATTRS ---help--- Support for the iSCSI Extensions for RDMA (iSER) Protocol |