Skip to content

Commit

Permalink
[SCSI] make scsi_wait_scan always modular
Browse files Browse the repository at this point in the history
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 <James.Bottomley@SteelEye.com>
  • Loading branch information
James Bottomley authored and James Bottomley committed Mar 20, 2007
1 parent 1544d67 commit 840c283
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions drivers/scsi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 840c283

Please sign in to comment.