patch-2.3.14 linux/drivers/scsi/scsi.c

Next file: linux/drivers/scsi/scsi_error.c
Previous file: linux/drivers/scsi/pas16.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.13/linux/drivers/scsi/scsi.c linux/drivers/scsi/scsi.c
@@ -406,6 +406,11 @@
 	up(SCpnt->request.sem);
 }
 
+MODULE_PARM(scsi_logging_level, "i");
+MODULE_PARM_DESC(scsi_logging_level, "SCSI logging level; should be zero or nonzero");
+
+#ifndef MODULE
+
 static int __init scsi_logging_setup (char *str)
 {
 	int tmp;
@@ -422,12 +427,19 @@
 
 __setup("scsi_logging=", scsi_logging_setup);
 
+#endif
+
 #ifdef CONFIG_SCSI_MULTI_LUN
 static int max_scsi_luns = 8;
 #else
 static int max_scsi_luns = 1;
 #endif
 
+MODULE_PARM(max_scsi_luns, "i");
+MODULE_PARM_DESC(max_scsi_luns, "last scsi LUN (should be between 1 and 8)");
+
+#ifndef MODULE
+
 static int __init scsi_luns_setup (char *str)
 {
 	int tmp;
@@ -443,6 +455,9 @@
 }
 
 __setup("max_scsi_luns=", scsi_luns_setup);
+
+#endif
+
 /*
  *  Detecting SCSI devices :
  *  We scan all present host adapter's busses,  from ID 0 to ID (max_id).

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)