VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

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

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