diff options
| author | James Bottomley <James.Bottomley@steeleye.com> | 2007-03-11 14:16:43 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-03-20 10:48:23 -0500 |
| commit | 840c2835a1c867281d27158378a9d34f593a7664 (patch) | |
| tree | 7b66a38d50fe41eec8e32975541ae63b5227e86d /drivers/scsi | |
| parent | 1544d67738c864245b8a061fb72093daeea8d4f1 (diff) | |
| download | talos-op-linux-840c2835a1c867281d27158378a9d34f593a7664.tar.gz talos-op-linux-840c2835a1c867281d27158378a9d34f593a7664.zip | |
[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 <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/scsi/Makefile | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 4cd280e86966..f3bc0f459dea 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. +config SCSI_WAIT_SCAN + 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 79ecf4ebe6eb..41c7883b24aa 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 \ |
