[PATCH] W1: cleanups

[linux-2.6] / drivers / scsi / pluto.c

diff --git a/drivers/scsi/pluto.c b/drivers/scsi/pluto.c
index 3cbd8187246eaf340de67ad740344a76f74986cb..83a671799934465240952a5b1b4d5f8b455dd1e3 100644 (file)
--- a/drivers/scsi/pluto.c
+++ b/drivers/scsi/pluto.c
@@ -27,6 +27,9 @@
 
 #include <linux/module.h>
 
+#define RQ_SCSI_BUSY           0xffff
+#define RQ_SCSI_DONE           0xfffe
+
 /* #define PLUTO_DEBUG */
 
 #define pluto_printk printk ("PLUTO %s: ", fc->name); printk
@@ -71,7 +74,7 @@ static void __init pluto_detect_scsi_done(Scsi_Cmnd *SCpnt)
                up(&fc_sem);
 }
 
-int pluto_slave_configure(Scsi_Device *device)
+int pluto_slave_configure(struct scsi_device *device)
 {
        int depth_to_use;
 
@@ -94,7 +97,7 @@ int __init pluto_detect(struct scsi_host_template *tpnt)
 {
        int i, retry, nplutos;
        fc_channel *fc;
-       Scsi_Device dev;
+       struct scsi_device dev;
        DEFINE_TIMER(fc_timer, pluto_detect_timeout, 0, 0);
 
        tpnt->proc_name = "pluto";