This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / scsi / in2000.c

diff --git a/drivers/scsi/in2000.c b/drivers/scsi/in2000.c
index 2597da1..46d18e3 100644 (file)
--- a/drivers/scsi/in2000.c
+++ b/drivers/scsi/in2000.c
@@ -184,9 +184,11 @@
 static char *setup_args[] = { "", "", "", "", "", "", "", "", "" };
 
 /* filled in by 'insmod' */
-static char *setup_strings;
+static char *setup_strings = 0;
 
+#ifdef MODULE_PARM
 MODULE_PARM(setup_strings, "s");
+#endif
 
 static inline uchar read_3393(struct IN2000_hostdata *hostdata, uchar reg_num)
 {
@@ -468,7 +470,7 @@ static void in2000_execute(struct Scsi_Host *instance)
         */
 
        cmd = (Scsi_Cmnd *) hostdata->input_Q;
-       prev = NULL;
+       prev = 0;
        while (cmd) {
                if (!(hostdata->busy[cmd->device->id] & (1 << cmd->device->lun)))
                        break;
@@ -1702,7 +1704,7 @@ static int in2000_abort(Scsi_Cmnd * cmd)
  */
 
        tmp = (Scsi_Cmnd *) hostdata->input_Q;
-       prev = NULL;
+       prev = 0;
        while (tmp) {
                if (tmp == cmd) {
                        if (prev)
@@ -1923,7 +1925,7 @@ static int __init in2000_detect(Scsi_Host_Template * tpnt)
  */
 
        if (!done_setup && setup_strings)
-               in2000_setup(setup_strings, NULL);
+               in2000_setup(setup_strings, 0);
 
        detect_count = 0;
        for (bios = 0; bios_tab[bios]; bios++) {