---

yaml --- r: 53635 b: refs/heads/master c: 840c283 h: refs/heads/master i: 53633: 8ea69cd 53631: 4579893 v: v3
git-mirror · Mar 20, 2007 · d1a50a3 · d1a50a3
1 parent 4de4818
commit d1a50a3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1544d67738c864245b8a061fb72093daeea8d4f1
+refs/heads/master: 840c2835a1c867281d27158378a9d34f593a7664
diff --git a/trunk/drivers/scsi/Kconfig b/trunk/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.
 
+config SCSI_WAIT_SCAN
+	tristate
+	default m
+	depends on SCSI
+	depends on MODULES
+
 menu "SCSI Transports"
 	depends on SCSI
 

diff --git a/trunk/drivers/scsi/Makefile b/trunk/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 \