diff options
| author | James Bottomley | 2015-12-03 18:32:33 +0100 |
|---|---|---|
| committer | James Bottomley | 2015-12-03 18:32:33 +0100 |
| commit | be9e2f775f5a3147205c552534c3abf0f9374a13 (patch) | |
| tree | 9c10584796d73f80295d9c238a089f12621db316 /drivers/scsi/Kconfig | |
| parent | Revert "scsi: Fix a bdi reregistration race" (diff) | |
| parent | mpt3sas: fix Kconfig dependency problem for mpt2sas back compatibility (diff) | |
| download | kernel-qcow2-linux-be9e2f775f5a3147205c552534c3abf0f9374a13.tar.gz kernel-qcow2-linux-be9e2f775f5a3147205c552534c3abf0f9374a13.tar.xz kernel-qcow2-linux-be9e2f775f5a3147205c552534c3abf0f9374a13.zip | |
Merge branch 'mkp-fixes' into fixes
Diffstat (limited to 'drivers/scsi/Kconfig')
| -rw-r--r-- | drivers/scsi/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 5f692ae40749..64eed87d34a8 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -364,6 +364,7 @@ config SCSI_HPSA tristate "HP Smart Array SCSI driver" depends on PCI && SCSI select CHECK_SIGNATURE + select SCSI_SAS_ATTRS help This driver supports HP Smart Array Controllers (circa 2009). It is a SCSI alternative to the cciss driver, which is a block @@ -499,6 +500,7 @@ config SCSI_ADVANSYS tristate "AdvanSys SCSI support" depends on SCSI depends on ISA || EISA || PCI + depends on ISA_DMA_API || !ISA help This is a driver for all SCSI host adapters manufactured by AdvanSys. It is documented in the kernel source in |