aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-07-28 10:45:43 -0400
committerJames Bottomley <jejb@mulgrave.localdomain>2007-07-28 10:56:06 -0400
commit99d4d0a9f251a87e0710c6f1fb46ac0d4bce12cb (patch)
treee53350d1d822ff49ddd0abb7d075bcd054a3ba02
parent9859c1aa7e16822c574e1be89d61fbfe6188b50f (diff)
[SCSI] 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> Acked-by: Jens Axboe <jens.axboe@oracle.com> Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r--block/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/Kconfig b/block/Kconfig
index ca2ef4e08497..2484e0e9d89c 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