This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c
index 4dca4c1..037e1ab 100644 (file)
--- a/drivers/scsi/wd7000.c
+++ b/drivers/scsi/wd7000.c
@@ -165,6 +165,7 @@
  * Removed now obsolete wd7000.h
  */
 
+#include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
@@ -183,7 +184,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsicam.h>
 
 
@@ -846,7 +847,7 @@ static inline int command_out(Adapter * host, unchar * cmd, int len)
 static inline Scb *alloc_scbs(struct Scsi_Host *host, int needed)
 {
        register Scb *scb, *p = NULL;
-       register unsigned long flags;
+       unsigned long flags;
        register unsigned long timeout = jiffies + WAITnexttimeout;
        register unsigned long now;
        int i;
@@ -898,7 +899,7 @@ static inline Scb *alloc_scbs(struct Scsi_Host *host, int needed)
 
 static inline void free_scb(Scb * scb)
 {
-       register unsigned long flags;
+       unsigned long flags;
 
        spin_lock_irqsave(&scbpool_lock, flags);
 
@@ -936,7 +937,7 @@ static int mail_out(Adapter * host, Scb * scbptr)
  */
 {
        register int i, ogmb;
-       register unsigned long flags;
+       unsigned long flags;
        unchar start_ogmb;
        Mailbox *ogmbs = host->mb.ogmb;
        int *next_ogmb = &(host->next_ogmb);
@@ -1604,6 +1605,7 @@ static int wd7000_release(struct Scsi_Host *shost)
        return 0;
 }
 
+#if 0
 /*
  *  I have absolutely NO idea how to do an abort with the WD7000...
  */
@@ -1618,7 +1620,7 @@ static int wd7000_abort(Scsi_Cmnd * SCpnt)
        }
        return FAILED;
 }
-
+#endif
 
 /*
  *  I also have no idea how to do a reset...