aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorPaul Mundt2007-07-25 03:02:30 -0500
committerJens Axboe2007-07-27 01:08:24 -0500
commit4d5d8e9d3e55100bc12cf17a5ebc8a3c70befd38 (patch)
tree86c712d4058b4a06de45615b2af28b1c86c8230d /block
parent4e97182a22ed5ca6a5cbc39275d4752d5a4369da (diff)
downloadkernel-common-4d5d8e9d3e55100bc12cf17a5ebc8a3c70befd38.tar.gz
kernel-common-4d5d8e9d3e55100bc12cf17a5ebc8a3c70befd38.tar.xz
kernel-common-4d5d8e9d3e55100bc12cf17a5ebc8a3c70befd38.zip
bsg: Fix build for CONFIG_BLOCK=n
BLK_DEV_BSG was added outside of the if BLOCK check, which allows it to be enabled when CONFIG_BLOCK=n. This leads to many screenlengths of errors, starting with a parse error on the request_queue_t definition. Obviously this wasn't intended for CONFIG_BLOCK=n usage, so just move the option back in to the block. Caught with a randconfig on sh. Signed-off-by: Paul Mundt <lethal@linux-sh.org> -- block/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
-rw-r--r--block/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/Kconfig b/block/Kconfig
index ca2ef4e0849..2484e0e9d89 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -49,8 +49,6 @@ config LSF
49 49
50 If unsure, say Y. 50 If unsure, say Y.
51 51
52endif # BLOCK
53
54config BLK_DEV_BSG 52config BLK_DEV_BSG
55 bool "Block layer SG support v4 (EXPERIMENTAL)" 53 bool "Block layer SG support v4 (EXPERIMENTAL)"
56 depends on EXPERIMENTAL 54 depends on EXPERIMENTAL
@@ -64,4 +62,6 @@ config BLK_DEV_BSG
64 protocols (e.g. Task Management Functions and SMP in Serial 62 protocols (e.g. Task Management Functions and SMP in Serial
65 Attached SCSI). 63 Attached SCSI).
66 64
65endif # BLOCK
66
67source block/Kconfig.iosched 67source block/Kconfig.iosched