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/Kconfig | |
| parent | 9f9499ae8e6415cefc4fe0a96ad0e27864353c89 (diff) | |
| parent | cfeb91b375ad5f52665e00d374a4e403d2e6063e (diff) | |
| download | linux-stable-c6333f9f9f7646e311248a09e8ed96126a97aba8.tar.gz linux-stable-c6333f9f9f7646e311248a09e8ed96126a97aba8.tar.bz2 linux-stable-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/Kconfig')
| -rw-r--r-- | drivers/scsi/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 64eed87d34a8..9900e6191b27 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -1104,6 +1104,7 @@ config SCSI_IPR tristate "IBM Power Linux RAID adapter support" depends on PCI && SCSI && ATA select FW_LOADER + select IRQ_POLL ---help--- This driver supports the IBM Power Linux family RAID adapters. This includes IBM pSeries 5712, 5703, 5709, and 570A, as well |