Merge branch 'mkp-fixes' into fixes

[mirror_ubuntu-zesty-kernel.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index e0d29241fbb2e686a74846a0c674fd58d527b466..64eed87d34a87840d5da60d267383589541e1d73 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -242,13 +242,6 @@ config SCSI_SCAN_ASYNC
          system continues booting, and even probe devices on different
          busses in parallel, leading to a significant speed-up.
 
-         If you have built SCSI as modules, enabling this option can
-         be a problem as the devices may not have been found by the
-         time your system expects them to have been.  You can load the
-         scsi_wait_scan module to ensure that all scans have completed.
-         If you build your SCSI drivers into the kernel, then everything
-         will work fine if you say Y here.
-
          You can override this choice by specifying "scsi_mod.scan=sync"
          or async on the kernel's command line.