1 files changed, 12 insertions, 6 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 256c7bec7bd7..e2f44e6c0bcb 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -224,14 +224,15 @@ config SCSI_LOGGING
           can enable logging by saying Y to "/proc file system support" and
           "Sysctl support" below and executing the command
 
-          echo "scsi log token [level]" > /proc/scsi/scsi
+          echo <bitmask> > /proc/sys/dev/scsi/logging_level
 
-          at boot time after the /proc file system has been mounted.
+          where <bitmask> is a four byte value representing the logging type
+          and logging level for each type of logging selected.
 
-          There are a number of things that can be used for 'token' (you can
-          find them in the source: <file:drivers/scsi/scsi.c>), and this
-          allows you to select the types of information you want, and the
-          level allows you to select the level of verbosity.
+          There are a number of logging types and you can find them in the
+          source at <file:drivers/scsi/scsi_logging.h>. The logging levels
+          are also described in that file and they determine the verbosity of
+          the logging for each logging type.
 
           If you say N here, it may be harder to track down some types of SCSI
           problems. If you say Y here your kernel will be somewhat larger, but
@@ -570,6 +571,7 @@ config SCSI_ARCMSR_AER
           To enable this function, choose Y here.
 
 source "drivers/scsi/megaraid/Kconfig.megaraid"
+source "drivers/scsi/mpt2sas/Kconfig"
 
 config SCSI_HPTIOP
         tristate "HighPoint RocketRAID 3xxx/4xxx Controller support"
@@ -608,6 +610,7 @@ config SCSI_FLASHPOINT
 config LIBFC
         tristate "LibFC module"
         select SCSI_FC_ATTRS
+        select CRC32
         ---help---
           Fibre Channel library module
 
@@ -1535,6 +1538,7 @@ config SCSI_NSP32
 config SCSI_DEBUG
         tristate "SCSI debugging host simulator"
         depends on SCSI
+        select CRC_T10DIF
         help
           This is a host adapter simulator that can simulate multiple hosts
           each with multiple dummy SCSI devices (disks). It defaults to one
@@ -1803,4 +1807,6 @@ source "drivers/scsi/pcmcia/Kconfig"
 
 source "drivers/scsi/device_handler/Kconfig"
 
+source "drivers/scsi/osd/Kconfig"
+
 endmenu