Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block

[linux-2.6-omap-h63xx.git] / drivers / scsi / wd33c93.c

diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index 5754445fb36ad500fbe59291d2455acfadbe8ff2..d8a72609a31d4724d94cdcf6925aaa26b20bea85 100644 (file)
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -77,10 +77,9 @@
 #include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/delay.h>
-#include <linux/version.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
 #include <linux/blkdev.h>
-#include <asm/irq.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -466,7 +465,7 @@ wd33c93_execute(struct Scsi_Host *instance)
         */
 
        cmd = (struct scsi_cmnd *) hostdata->input_Q;
-       prev = 0;
+       prev = NULL;
        while (cmd) {
                if (!(hostdata->busy[cmd->device->id] & (1 << cmd->device->lun)))
                        break;
@@ -1570,7 +1569,7 @@ wd33c93_abort(struct scsi_cmnd * cmd)
  */
 
        tmp = (struct scsi_cmnd *) hostdata->input_Q;
-       prev = 0;
+       prev = NULL;
        while (tmp) {
                if (tmp == cmd) {
                        if (prev)