Make BLK_DEV_BSG depend strictly on SCSI=y

The SCSI code can be compiled modular, but BLK_DEV_BSG currently cannot,
and depends on the SCSI layer.  So make sure that it depends on the SCSI
layer being compiled in, not just available as a module.

Noticed by Jeff Garzik and S.Çağlar Onur.

Cc: Jeff Garzik <jeff@garzik.org>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: S.Çağlar Onur <caglar@pardus.org.tr>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/block/Kconfig b/block/Kconfig
index 1d16b08e15063e97d17d3c519deecc3395e2ff3c..6597b60e8e69a58e71e3c8d997dc8c8d6e7af8a9 100644 (file)
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -53,7 +53,7 @@ endif # BLOCK
 
 config BLK_DEV_BSG
        bool "Block layer SG support"
-       depends on SCSI && EXPERIMENTAL
+       depends on (SCSI=y) && EXPERIMENTAL
        default y
        ---help---
        Saying Y here will enable generic SG (SCSI generic) v4