Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99d4d0a9 authored by Paul Mundt's avatar Paul Mundt Committed by James Bottomley
Browse files

[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: default avatarPaul Mundt <lethal@linux-sh.org>
Acked-by: default avatarJens Axboe <jens.axboe@oracle.com>
Acked-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 9859c1aa
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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