Merge master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/drivers/scsi/pluto.h b/drivers/scsi/pluto.h
index 4c057f10d96e234ad7d04c59eb43defd2c8c9d9a..5da20616ac36c092ee0e0cf64a9d004a7f2de487 100644 (file)
--- a/drivers/scsi/pluto.h
+++ b/drivers/scsi/pluto.h
@@ -41,7 +41,7 @@ struct pluto_inquiry {
 int pluto_detect(struct scsi_host_template *);
 int pluto_release(struct Scsi_Host *);
 const char * pluto_info(struct Scsi_Host *);
-int pluto_slave_configure(Scsi_Device *);
+int pluto_slave_configure(struct scsi_device *);
 
 #endif /* !(_PLUTO_H) */