aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-09-30 16:59:54 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-30 16:59:54 -0400
commitcfae35804bcb909225d6f4eb5bd29e25971614d8 (patch)
tree029566def2c19f2f19c1510c719ca8898f224c2e
parent56f29d7fe452890eeeb7f2b0138b2d95b9745fb6 (diff)
parent51d7513a8a54e4210d358ff1dbd34daab99a6638 (diff)
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
-rw-r--r--block/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/Kconfig b/block/Kconfig
index 9af6c614dfde..83766a6bdee2 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -2,7 +2,7 @@
2# Block layer core configuration 2# Block layer core configuration
3# 3#
4config BLOCK 4config BLOCK
5 bool "Enable the block layer" 5 bool "Enable the block layer" if EMBEDDED
6 default y 6 default y
7 help 7 help
8 This permits the block layer to be removed from the kernel if it's not 8 This permits the block layer to be removed from the kernel if it's not