Merge branch 'block' of git://brick.kernel.dk/data/git/linux-2.6-block

* 'block' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] Only enable CONFIG_BLOCK option for embedded

block/Kconfig

@@ -2,7 +2,7 @@
 # Block layer core configuration
 #
 config BLOCK
-       bool "Enable the block layer"
+       bool "Enable the block layer" if EMBEDDED
        default y
        help
 	 This permits the block layer to be removed from the kernel if it's not