diff options
author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2015-12-03 17:32:33 (GMT) |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2015-12-03 17:32:33 (GMT) |
commit | be9e2f775f5a3147205c552534c3abf0f9374a13 (patch) | |
tree | 9c10584796d73f80295d9c238a089f12621db316 /drivers/scsi/Kconfig | |
parent | e619e6cbecb7fe97a924d625e848605333457b13 (diff) | |
parent | 3ddda3e4c82dea58933bde8d0f6ef34470c360cb (diff) | |
download | linux-be9e2f775f5a3147205c552534c3abf0f9374a13.tar.xz |
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 5f692ae..64eed87 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 |