Merge branch 'from-linus' into upstream

[linux-2.6] / drivers / scsi / seagate.h

diff --git a/drivers/scsi/seagate.h b/drivers/scsi/seagate.h
index e49e8ecfb54dce81b040006fb9263627e7168dcd..fb5f380fa4b39957f8f9bba3ffb05ba25f43d8d7 100644 (file)
--- a/drivers/scsi/seagate.h
+++ b/drivers/scsi/seagate.h
@@ -9,13 +9,11 @@
 #ifndef _SEAGATE_H
 #define SEAGATE_H
 
-static int seagate_st0x_detect(Scsi_Host_Template *);
+static int seagate_st0x_detect(struct scsi_host_template *);
 static int seagate_st0x_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
 
 static int seagate_st0x_abort(Scsi_Cmnd *);
 static const char *seagate_st0x_info(struct Scsi_Host *);
 static int seagate_st0x_bus_reset(Scsi_Cmnd *);
-static int seagate_st0x_device_reset(Scsi_Cmnd *);
-static int seagate_st0x_host_reset(Scsi_Cmnd *);
 
 #endif /* _SEAGATE_H */