Reenable SCSI=m

Reenable SCSI=m

[Andreas Schwab]

Since CONFIG_SCSI (a tristate) now depends on CONFIG_BLOCK (a bool) it is
no longer possible to set CONFIG_SCSI=m.  Fix that by putting `if
BLOCK/endif' around drivers/scsi/Kconfig instead of `depends on BLOCK' on
SCSI and RAID_ATTRS.

Signed-off-by: Andreas Schwab <schwab@suse.de>

---
 drivers/scsi/Kconfig |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: linux-2.6.19-rc1/drivers/scsi/Kconfig
===================================================================
--- linux-2.6.19-rc1.orig/drivers/scsi/Kconfig	2006-10-05 13:20:32.000000000 +0200
+++ linux-2.6.19-rc1/drivers/scsi/Kconfig	2006-10-05 13:49:03.000000000 +0200
@@ -1,15 +1,15 @@
+if BLOCK
+
 menu "SCSI device support"
 
 config RAID_ATTRS
 	tristate "RAID Transport Class"
 	default n
-	depends on BLOCK
 	---help---
 	  Provides RAID
 
 config SCSI
 	tristate "SCSI device support"
-	depends on BLOCK
 	---help---
 	  If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or
 	  any other SCSI device under Linux, say Y and make sure that you know
@@ -1739,3 +1739,5 @@ endmenu
 source "drivers/scsi/pcmcia/Kconfig"
 
 endmenu
+
+endif

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: Reenable SCSI=m

[Adrian Bunk]

On Thu, Oct 05, 2006 at 02:44:28PM +0200, Andreas Schwab wrote:

> Since CONFIG_SCSI (a tristate) now depends on CONFIG_BLOCK (a bool) it is
> no longer possible to set CONFIG_SCSI=m.
>...

A tristate depending on a bool is a common case that works just fine and 
allows the modular setting.

And CONFIG_SCSI=m is possible in 2.6.19-rc1.

What exactly is the problem you observed?

> Andreas.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: Reenable SCSI=m

[Andreas Schwab]

Adrian Bunk <bunk@stusta.de> writes:

> On Thu, Oct 05, 2006 at 02:44:28PM +0200, Andreas Schwab wrote:
>
>> Since CONFIG_SCSI (a tristate) now depends on CONFIG_BLOCK (a bool) it is
>> no longer possible to set CONFIG_SCSI=m.
>>...
>
> A tristate depending on a bool is a common case that works just fine and 
> allows the modular setting.

You are right.  My problem was that I said CONFIG_ATA=y when I meant
CONFIG_ATA=m which forced CONFIG_SCSI=y behind by back.  It didn't occur
to me that this was related.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."