From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 16 Jul 2007 23:52:44 +0000 (-0700)
Subject: Make BLK_DEV_BSG depend strictly on SCSI=y
X-Git-Tag: v2.6.23-rc1~771
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=29417b899a77aaba1c060f5e123db4f50006f58a;p=~emulex%2Finfiniband.git

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 1d16b08e150..6597b60e8e6 100644
--- 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