diff --git a/[refs] b/[refs]
index 02e94f0962f6..db2a785b90a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 403aac965eba17a360a93c3b679f57b21030d4cd
+refs/heads/master: 3e29fe837a512229f4757cd93fdd7163d027d103
diff --git a/trunk/drivers/block/Kconfig b/trunk/drivers/block/Kconfig
index 17dc22282e14..432c17e1e0e6 100644
--- a/trunk/drivers/block/Kconfig
+++ b/trunk/drivers/block/Kconfig
@@ -168,7 +168,8 @@ config BLK_CPQ_CISS_DA
 
 config CISS_SCSI_TAPE
 	bool "SCSI tape drive support for Smart Array 5xxx"
-	depends on BLK_CPQ_CISS_DA && SCSI && PROC_FS
+	depends on BLK_CPQ_CISS_DA && PROC_FS
+	depends on SCSI=y || SCSI=BLK_CPQ_CISS_DA
 	help
 	  When enabled (Y), this option allows SCSI tape drives and SCSI medium
 	  changers (tape robots) to be accessed via a Compaq 5xxx array