From 46c27d2a492fb2fb8ffabd35ed2cfb593193c9ab Mon Sep 17 00:00:00 2001 From: Thadeu Lima de Souza Cascardo Date: Sun, 17 Jan 2010 20:27:53 +0000 Subject: scsi: allow SCSI_WAIT_SCAN to be disabled in embedded systems I know scsi_wait_scan is too little and is always built as a module, but: * This allows it to be disabled in cases that modules are enabled but all configuration is built-in. It will not surprise users that a module has been built. * It still does not surprise users that have disabled it by accident, because they only have a choice if they've picked up EMBEDDED. * This change allows it to be built-in. It uses late_initcall, which will put it ahead of other (SCSI) drivers. Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Javier Viguera --- drivers/scsi/Kconfig | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'drivers/scsi') diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 9c23122f755f..9eae292631e9 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -258,21 +258,21 @@ config SCSI_SCAN_ASYNC or async on the kernel's command line. config SCSI_WAIT_SCAN - tristate # No prompt here, this is an invisible symbol. + tristate "Waits for all SCSI async bus scans to complete" if EMBEDDED default m depends on SCSI depends on MODULES -# scsi_wait_scan is a loadable module which waits until all the async scans are -# complete. The idea is to use it in initrd/ initramfs scripts. You modprobe -# it after all the modprobes of the root SCSI drivers and it will wait until -# they have all finished scanning their buses before allowing the boot to -# proceed. (This method is not applicable if targets boot independently in -# parallel with the initiator, or with transports with non-deterministic target -# discovery schemes, or if a transport driver does not support scsi_wait_scan.) -# -# This symbol is not exposed as a prompt because little is to be gained by -# disabling it, whereas people who accidentally switch it off may wonder why -# their mkinitrd gets into trouble. + help + + scsi_wait_scan is a loadable module which waits until all the async + scans are complete. The idea is to use it in initrd/ initramfs + scripts. You modprobe it after all the modprobes of the root SCSI + drivers and it will wait until they have all finished scanning their + buses before allowing the boot to proceed. (This method is not + applicable if targets boot independently in parallel with the + initiator, or with transports with non-deterministic target + discovery schemes, or if a transport driver does not support + scsi_wait_scan.) menu "SCSI Transports" depends on SCSI -- cgit v1.2.3