diff options
author | Doug Ledford <dledford@redhat.com> | 2015-12-15 14:10:44 -0500 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2015-12-15 14:10:44 -0500 |
commit | c6333f9f9f7646e311248a09e8ed96126a97aba8 (patch) | |
tree | 1a86124c5b43fa858f1d8d7beb99bcd29d6d6ab7 /drivers/scsi/be2iscsi/Kconfig | |
parent | Linux 4.4-rc5 (diff) | |
parent | IB/iser: Convert to CQ abstraction (diff) | |
download | linux-dev-c6333f9f9f7646e311248a09e8ed96126a97aba8.tar.xz linux-dev-c6333f9f9f7646e311248a09e8ed96126a97aba8.zip |
Merge branch 'rdma-cq.2' of git://git.infradead.org/users/hch/rdma into 4.5/rdma-cq
Signed-off-by: Doug Ledford <dledford@redhat.com>
Conflicts:
drivers/infiniband/ulp/srp/ib_srp.c - Conflicts with changes in
ib_srp.c introduced during 4.4-rc updates
Diffstat (limited to 'drivers/scsi/be2iscsi/Kconfig')
-rw-r--r-- | drivers/scsi/be2iscsi/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/be2iscsi/Kconfig b/drivers/scsi/be2iscsi/Kconfig index 4e7cad272469..bad5f32e1f67 100644 --- a/drivers/scsi/be2iscsi/Kconfig +++ b/drivers/scsi/be2iscsi/Kconfig @@ -3,6 +3,7 @@ config BE2ISCSI depends on PCI && SCSI && NET select SCSI_ISCSI_ATTRS select ISCSI_BOOT_SYSFS + select IRQ_POLL help This driver implements the iSCSI functionality for Emulex |