Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...

[~andy/linux] / drivers / scsi / libsas / Kconfig

diff --git a/drivers/scsi/libsas/Kconfig b/drivers/scsi/libsas/Kconfig
index aafdc92f83123a2611a92db295bf10ee571c55cc..18f33cd54411c7cf2772fc57780d16f1b62be8aa 100644 (file)
--- a/drivers/scsi/libsas/Kconfig
+++ b/drivers/scsi/libsas/Kconfig
@@ -30,6 +30,23 @@ config SCSI_SAS_LIBSAS
          This provides transport specific helpers for SAS drivers which
          use the domain device construct (like the aic94xxx).
 
          This provides transport specific helpers for SAS drivers which
          use the domain device construct (like the aic94xxx).
 

+config SCSI_SAS_ATA
+       bool "ATA support for libsas (requires libata)"
+       depends on SCSI_SAS_LIBSAS
+       depends on ATA = y || ATA = SCSI_SAS_LIBSAS
+       help
+               Builds in ATA support into libsas.  Will necessitate
+               the loading of libata along with libsas.
+
+config SCSI_SAS_HOST_SMP
+       bool "Support for SMP interpretation for SAS hosts"
+       default y
+       depends on SCSI_SAS_LIBSAS
+       help
+               Allows sas hosts to receive SMP frames.  Selecting this
+               option builds an SMP interpreter into libsas.  Say
+               N here if you want to save the few kb this consumes.
+

 config SCSI_SAS_LIBSAS_DEBUG
        bool "Compile the SAS Domain Transport Attributes in debug mode"
        default y
 config SCSI_SAS_LIBSAS_DEBUG
        bool "Compile the SAS Domain Transport Attributes in debug mode"
        default y