Signed-off-by: Ferenc Wagner <wferi@xxxxxxx> --- Documentation/kernel-parameters.txt | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 92e1ab8..848035b 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -2144,10 +2144,11 @@ and is between 256 and 4096 characters. It is defined in the file S390-tools package, available for download at http://www-128.ibm.com/developerworks/linux/linux390/s390-tools-1.5.4.html - scsi_mod.scan= [SCSI] sync (default) scans SCSI busses as they are - discovered. async scans them in kernel threads, - allowing boot to proceed. none ignores them, expecting - user space to do the scan. + scsi_mod.scan= [SCSI] sync scans SCSI busses as they are discovered. + async scans them in kernel threads, allowing boot to + proceed. none ignores them, expecting user space to + do the scan. Default is async if CONFIG_SCSI_SCAN_ASYNC + is defined, sync otherwise. security= [SECURITY] Choose a security module to enable at boot. If this boot parameter is not specified, only the first -- 1.5.6.5 -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html