diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-07-28 23:45:43 +0900 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-07-28 10:56:06 -0400 |
| commit | 99d4d0a9f251a87e0710c6f1fb46ac0d4bce12cb (patch) | |
| tree | e53350d1d822ff49ddd0abb7d075bcd054a3ba02 /block | |
| parent | 9859c1aa7e16822c574e1be89d61fbfe6188b50f (diff) | |
| download | linux-stable-99d4d0a9f251a87e0710c6f1fb46ac0d4bce12cb.tar.gz linux-stable-99d4d0a9f251a87e0710c6f1fb46ac0d4bce12cb.tar.bz2 linux-stable-99d4d0a9f251a87e0710c6f1fb46ac0d4bce12cb.zip | |
[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>
Diffstat (limited to 'block')
| -rw-r--r-- | block/Kconfig | 4 |
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 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 |