diff --git a/[refs] b/[refs]
index 13388afa0c6b..982700ff82bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f5c926e3cba972636b50ab872b421e992d4f401
+refs/heads/master: fd11d171e51a5b81c176d856d5df5612117e1a45
diff --git a/trunk/drivers/block/Kconfig b/trunk/drivers/block/Kconfig
index d6ad7b3ea0dc..6e23af1ecbdb 100644
--- a/trunk/drivers/block/Kconfig
+++ b/trunk/drivers/block/Kconfig
@@ -2,9 +2,12 @@
 # Block device driver configuration
 #
 
-if BLOCK
+menuconfig BLK_DEV
+	bool "Block devices"
+	depends on BLOCK
+	default y
 
-menu "Block devices"
+if BLK_DEV
 
 config BLK_DEV_FD
 	tristate "Normal floppy disk support"
@@ -422,6 +425,4 @@ config ATA_OVER_ETH
 
 source "drivers/s390/block/Kconfig"
 
-endmenu
-
-endif
+endif # BLK_DEV