From: Paul Mundt Date: Wed, 25 Jul 2007 08:02:30 +0000 (+0200) Subject: bsg: Fix build for CONFIG_BLOCK=n X-Git-Tag: v2.6.23-rc2~180^2~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4d5d8e9d3e55100bc12cf17a5ebc8a3c70befd38;p=linux-2.6-omap-h63xx.git 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 -- block/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Signed-off-by: Jens Axboe --- diff --git a/block/Kconfig b/block/Kconfig index ca2ef4e0849..2484e0e9d89 100644 --- a/block/Kconfig +++ b/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