Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 24304300d7b5..4916847d84ec 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -71,6 +71,12 @@ MODULE_PARM_DESC(ql2xfdmienable,
                 "Enables FDMI registratons "
                 "Default is 0 - no FDMI. 1 - perfom FDMI.");
 
+int ql2xprocessrscn;
+module_param(ql2xprocessrscn, int, S_IRUGO|S_IRUSR);
+MODULE_PARM_DESC(ql2xprocessrscn,
+                "Option to enable port RSCN handling via a series of less"
+                "fabric intrusive ADISCs and PLOGIs.");
+
 /*
  * SCSI host template entry points
  */