summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_scan.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-11 17:23:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-11 17:23:52 -0700
commitb7e70ca9c7d7f049bba8047d7ab49966fd5e9e9d (patch)
treef5af8945a6b2f7ee2150420450d980cffd8173d4 /drivers/scsi/scsi_scan.c
parent7f8730781830cd38438b10d44d17ccb8eafa9265 (diff)
parent3c31b52f96f7b559d950b16113c0f68c72a1985e (diff)
downloadop-kernel-dev-b7e70ca9c7d7f049bba8047d7ab49966fd5e9e9d.zip
op-kernel-dev-b7e70ca9c7d7f049bba8047d7ab49966fd5e9e9d.tar.gz
Merge branch 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci
Pull async SCSI resume support from Dan Williams: "Allow disks and other devices to resume in parallel. This provides a tangible speed up for a non-esoteric use case (laptop resume): https://01.org/suspendresume/blogs/tebrandt/2013/hard-disk-resume-optimization-simpler-approach" * 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci: scsi: async sd resume
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
-rw-r--r--drivers/scsi/scsi_scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 27f96d5..e02b3aa 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -97,7 +97,7 @@ MODULE_PARM_DESC(max_luns,
#define SCSI_SCAN_TYPE_DEFAULT "sync"
#endif
-static char scsi_scan_type[6] = SCSI_SCAN_TYPE_DEFAULT;
+char scsi_scan_type[6] = SCSI_SCAN_TYPE_DEFAULT;
module_param_string(scan, scsi_scan_type, sizeof(scsi_scan_type), S_IRUGO);
MODULE_PARM_DESC(scan, "sync, async or none");
OpenPOWER on IntegriCloud