Merge branch 'via-velocity' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...

[linux-2.6] / drivers / scsi / libsas / Kconfig

diff --git a/drivers/scsi/libsas/Kconfig b/drivers/scsi/libsas/Kconfig
index 3a3c1ac9c6cdcd495d477e7219d4eddc0f51bbc8..18f33cd54411c7cf2772fc57780d16f1b62be8aa 100644 (file)
--- a/drivers/scsi/libsas/Kconfig
+++ b/drivers/scsi/libsas/Kconfig
@@ -32,11 +32,21 @@ config SCSI_SAS_LIBSAS
 
 config SCSI_SAS_ATA
        bool "ATA support for libsas (requires libata)"
 
 config SCSI_SAS_ATA
        bool "ATA support for libsas (requires libata)"

-       depends on SCSI_SAS_LIBSAS && ATA
+       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.
 
        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