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

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

diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 13d5875..b43feb9 100644 (file)
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -44,7 +44,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
 #include <scsi/scsi.h>
 
@@ -1604,7 +1604,7 @@ static int nsp32_proc_info(
        thislength = pos - (buffer + offset);
 
        if(thislength < 0) {
-               *start = 0;
+               *start = NULL;
                 return 0;
         }
 
@@ -3342,6 +3342,48 @@ static int nsp32_prom_read(nsp32_hw_data *data, int romaddr)
        return val;
 }
 
+static inline void nsp32_prom_set(nsp32_hw_data *data, int bit, int val)
+{
+       int base = data->BaseAddress;
+       int tmp;
+
+       tmp = nsp32_index_read1(base, SERIAL_ROM_CTL);
+
+       if (val == 0) {
+               tmp &= ~bit;
+       } else {
+               tmp |=  bit;
+       }
+
+       nsp32_index_write1(base, SERIAL_ROM_CTL, tmp);
+
+       udelay(10);
+}
+
+static inline int nsp32_prom_get(nsp32_hw_data *data, int bit)
+{
+       int base = data->BaseAddress;
+       int tmp, ret;
+
+       if (bit != SDA) {
+               nsp32_msg(KERN_ERR, "return value is not appropriate");
+               return 0;
+       }
+
+
+       tmp = nsp32_index_read1(base, SERIAL_ROM_CTL) & bit;
+
+       if (tmp == 0) {
+               ret = 0;
+       } else {
+               ret = 1;
+       }
+
+       udelay(10);
+
+       return ret;
+}
+
 static void nsp32_prom_start (nsp32_hw_data *data)
 {
        /* start condition */
@@ -3387,48 +3429,6 @@ static int nsp32_prom_read_bit(nsp32_hw_data *data)
        return val;
 }
 
-static inline void nsp32_prom_set(nsp32_hw_data *data, int bit, int val)
-{
-       int base = data->BaseAddress;
-       int tmp;
-
-       tmp = nsp32_index_read1(base, SERIAL_ROM_CTL);
-
-       if (val == 0) {
-               tmp &= ~bit;
-       } else {
-               tmp |=  bit;
-       }
-
-       nsp32_index_write1(base, SERIAL_ROM_CTL, tmp);
-
-       udelay(10);
-}
-
-static inline int nsp32_prom_get(nsp32_hw_data *data, int bit)
-{
-       int base = data->BaseAddress;
-       int tmp, ret;
-
-       if (bit != SDA) {
-               nsp32_msg(KERN_ERR, "return value is not appropriate");
-               return 0;
-       }
-
-
-       tmp = nsp32_index_read1(base, SERIAL_ROM_CTL) & bit;
-
-       if (tmp == 0) {
-               ret = 0;
-       } else {
-               ret = 1;
-       }
-
-       udelay(10);
-
-       return ret;
-}
-
 
 /**************************************************************************
  * Power Management