Merge remote-tracking branch 'mkp-scsi/4.5/scsi-queue' into misc

[cascardo/linux.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index abdd436..23d862d 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -194,6 +194,7 @@ config CHR_DEV_SCH
 config SCSI_ENCLOSURE
        tristate "SCSI Enclosure Support"
        depends on SCSI && ENCLOSURE_SERVICES
+       depends on m || SCSI_SAS_ATTRS != m
        help
          Enclosures are devices sitting on or in SCSI backplanes that
          manage devices.  If you have a disk cage, the chances are that
@@ -364,6 +365,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
@@ -500,6 +502,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