patch-2_6_7-vs1_9_1_12

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

diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index dee898d..6a5291b 100644 (file)
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -240,8 +240,6 @@
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <linux/blkdev.h>
-#include "scsi.h"
-#include "hosts.h"
 #include <asm/system.h>
 #include <linux/errno.h>
 #include <linux/string.h>
@@ -259,6 +257,7 @@
 #include <scsi/scsicam.h>
 
 #include "scsi.h"
+#include "hosts.h"
 #include "aha152x.h"
 
 
@@ -578,11 +577,11 @@ struct aha152x_scdata {
 #define MSGO(i)                        (HOSTDATA(shpnt)->msgo[i])
 #define MSGO_I                 (HOSTDATA(shpnt)->msgo_i)
 #define MSGOLEN                        (HOSTDATA(shpnt)->msgo_len)
-#define ADDMSGO(x)             (MSGOLEN<256 ? MSGO(MSGOLEN++)=x : aha152x_error(shpnt,"MSGO overflow"))
+#define ADDMSGO(x)             (MSGOLEN<256 ? (void)(MSGO(MSGOLEN++)=x) : aha152x_error(shpnt,"MSGO overflow"))
 
 #define MSGI(i)                        (HOSTDATA(shpnt)->msgi[i])
 #define MSGILEN                        (HOSTDATA(shpnt)->msgi_len)
-#define ADDMSGI(x)             (MSGILEN<256 ? MSGI(MSGILEN++)=x : aha152x_error(shpnt,"MSGI overflow"))
+#define ADDMSGI(x)             (MSGILEN<256 ? (void)(MSGI(MSGILEN++)=x) : aha152x_error(shpnt,"MSGI overflow"))
 
 #define DATA_LEN               (HOSTDATA(shpnt)->data_len)