Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6-omap-h63xx.git] / drivers / scsi / fcal.h

diff --git a/drivers/scsi/fcal.h b/drivers/scsi/fcal.h
index 191b38c791a0cb869d48e9520f76abec0032e99c..7ff2c3494f9ee6a4e56efe8c22b38a0a1d049289 100644 (file)
--- a/drivers/scsi/fcal.h
+++ b/drivers/scsi/fcal.h
@@ -22,6 +22,6 @@ struct fcal {
 
 int fcal_detect(struct scsi_host_template *);
 int fcal_release(struct Scsi_Host *);
-int fcal_slave_configure(Scsi_Device *);
+int fcal_slave_configure(struct scsi_device *);
 
 #endif /* !(_FCAL_H) */