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

[linux-2.6-omap-h63xx.git] / drivers / scsi / libsas / Kconfig

diff --git a/drivers/scsi/libsas/Kconfig b/drivers/scsi/libsas/Kconfig
index aafdc92f83123a2611a92db295bf10ee571c55cc..c01a40d321d43530b02e814b3cd335d7f0b54797 100644 (file)
--- a/drivers/scsi/libsas/Kconfig
+++ b/drivers/scsi/libsas/Kconfig
@@ -30,6 +30,14 @@ config SCSI_SAS_LIBSAS
          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_LIBSAS_DEBUG
        bool "Compile the SAS Domain Transport Attributes in debug mode"
        default y