Commit:     840c2835a1c867281d27158378a9d34f593a7664
Parent:     1544d67738c864245b8a061fb72093daeea8d4f1
Author:     James Bottomley <[EMAIL PROTECTED]>
AuthorDate: Sun Mar 11 14:16:43 2007 -0500
Committer:  James Bottomley <[EMAIL PROTECTED]>
CommitDate: Tue Mar 20 10:48:23 2007 -0500

    [SCSI] make scsi_wait_scan always modular
    Currently scsi_wait_scan is only built modular if SCSI is modular.
    However, it's perfectly possible for a built in SCSI still to have
    modular drivers and thus need scsi_wait_scan as a module.  Therefore,
    scsi_wait_scan should always be built as a module (unless the kernel
    doesn't support modules).
    Signed-off-by: James Bottomley <[EMAIL PROTECTED]>
 drivers/scsi/Kconfig  |    6 ++++++
 drivers/scsi/Makefile |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 4cd280e..f3bc0f4 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -241,6 +241,12 @@ config SCSI_SCAN_ASYNC
          You can override this choice by specifying "scsi_mod.scan=sync"
          or async on the kernel's command line.
+       tristate
+       default m
+       depends on SCSI
+       depends on MODULES
 menu "SCSI Transports"
        depends on SCSI
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 79ecf4e..41c7883 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -145,7 +145,7 @@ obj-$(CONFIG_CHR_DEV_SCH)   += ch.o
 # This goes last, so that "real" scsi devices probe earlier
 obj-$(CONFIG_SCSI_DEBUG)       += scsi_debug.o
-obj-$(CONFIG_SCSI)             += scsi_wait_scan.o
+obj-$(CONFIG_SCSI_WAIT_SCAN)   += scsi_wait_scan.o
 scsi_mod-y                     += scsi.o hosts.o scsi_ioctl.o constants.o \
                                   scsicam.o scsi_error.o scsi_lib.o \
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to