diff --git a/[refs] b/[refs]
index b080a112a26a..ab125dd31129 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab9c232286c2b77be78441c2d8396500b045777e
+refs/heads/master: 2b9e0aae1d50e880c58d46788e5e3ebd89d75d62
diff --git a/trunk/block/Kconfig b/trunk/block/Kconfig
index e10895647f72..9bda7bc80307 100644
--- a/trunk/block/Kconfig
+++ b/trunk/block/Kconfig
@@ -62,10 +62,11 @@ config BLK_DEV_BSG
 	protocols (e.g. Task Management Functions and SMP in Serial
 	Attached SCSI).
 
+endif # BLOCK
+
 config BLOCK_COMPAT
 	bool
+	depends on BLOCK && COMPAT
 	default y
 
-endif # BLOCK
-
 source block/Kconfig.iosched