diff --git a/[refs] b/[refs]
index 47104aba1c87..9aad66959387 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e9a8a0d56c5d9d87adbefbbc8c8728c529fd95a
+refs/heads/master: 15617ff66c777b008e170f9c5b0e8a9854937648
diff --git a/trunk/drivers/scsi/libsas/Kconfig b/trunk/drivers/scsi/libsas/Kconfig
index 3a3c1ac9c6cd..c01a40d321d4 100644
--- a/trunk/drivers/scsi/libsas/Kconfig
+++ b/trunk/drivers/scsi/libsas/Kconfig
@@ -32,7 +32,8 @@ config SCSI_SAS_LIBSAS
 
 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.