Commit 4d5d8e9d authored by Paul Mundt's avatar Paul Mundt Committed by Jens Axboe
Browse files

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>

--

 block/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 4e97182a
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -49,8 +49,6 @@ config LSF


	  If unsure, say Y.
	  If unsure, say Y.


endif # BLOCK

config BLK_DEV_BSG
config BLK_DEV_BSG
	bool "Block layer SG support v4 (EXPERIMENTAL)"
	bool "Block layer SG support v4 (EXPERIMENTAL)"
	depends on EXPERIMENTAL
	depends on EXPERIMENTAL
@@ -64,4 +62,6 @@ config BLK_DEV_BSG
	protocols (e.g. Task Management Functions and SMP in Serial
	protocols (e.g. Task Management Functions and SMP in Serial
	Attached SCSI).
	Attached SCSI).


endif # BLOCK

source block/Kconfig.iosched
source block/Kconfig.iosched