diff --git a/[refs] b/[refs]
index 8543ce27846e..77fe2e04c96e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a54890d7a6f37a4658294cbce650af4d1fabb8c9
+refs/heads/master: 29417b899a77aaba1c060f5e123db4f50006f58a
diff --git a/trunk/block/Kconfig b/trunk/block/Kconfig
index 1d16b08e1506..6597b60e8e69 100644
--- a/trunk/block/Kconfig
+++ b/trunk/block/Kconfig
@@ -53,7 +53,7 @@ endif # BLOCK
 
 config BLK_DEV_BSG
 	bool "Block layer SG support"
-	depends on SCSI && EXPERIMENTAL
+	depends on (SCSI=y) && EXPERIMENTAL
 	default y
 	---help---
 	Saying Y here will enable generic SG (SCSI generic) v4