diff --git a/[refs] b/[refs]
index a4ff027ff476..12bbaf55411a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9859c1aa7e16822c574e1be89d61fbfe6188b50f
+refs/heads/master: 99d4d0a9f251a87e0710c6f1fb46ac0d4bce12cb
diff --git a/trunk/block/Kconfig b/trunk/block/Kconfig
index ca2ef4e08497..2484e0e9d89c 100644
--- a/trunk/block/Kconfig
+++ b/trunk/block/Kconfig
@@ -49,8 +49,6 @@ config LSF
 
 	  If unsure, say Y.
 
-endif # BLOCK
-
 config BLK_DEV_BSG
 	bool "Block layer SG support v4 (EXPERIMENTAL)"
 	depends on EXPERIMENTAL
@@ -64,4 +62,6 @@ config BLK_DEV_BSG
 	protocols (e.g. Task Management Functions and SMP in Serial
 	Attached SCSI).
 
+endif # BLOCK
+
 source block/Kconfig.iosched