diff options
author | Steve French <sfrench@us.ibm.com> | 2005-11-12 22:53:33 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-11-12 22:53:33 -0500 |
commit | 1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9 (patch) | |
tree | 2e0051ccb147b0553d50c14681c50881098859d6 /drivers/scsi/ibmmca.h | |
parent | e89dc9209692293434da45ec31826a55becb91c0 (diff) | |
parent | 9e6c67fd2716720d9029d38ea25884efcfdedeb6 (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/scsi/ibmmca.h')
-rw-r--r-- | drivers/scsi/ibmmca.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ibmmca.h b/drivers/scsi/ibmmca.h index 6d68f603e9b8..017ee2fa6d63 100644 --- a/drivers/scsi/ibmmca.h +++ b/drivers/scsi/ibmmca.h | |||
@@ -11,7 +11,7 @@ | |||
11 | /* Common forward declarations for all Linux-versions: */ | 11 | /* Common forward declarations for all Linux-versions: */ |
12 | 12 | ||
13 | /* Interfaces to the midlevel Linux SCSI driver */ | 13 | /* Interfaces to the midlevel Linux SCSI driver */ |
14 | static int ibmmca_detect (Scsi_Host_Template *); | 14 | static int ibmmca_detect (struct scsi_host_template *); |
15 | static int ibmmca_release (struct Scsi_Host *); | 15 | static int ibmmca_release (struct Scsi_Host *); |
16 | static int ibmmca_queuecommand (Scsi_Cmnd *, void (*done) (Scsi_Cmnd *)); | 16 | static int ibmmca_queuecommand (Scsi_Cmnd *, void (*done) (Scsi_Cmnd *)); |
17 | static int ibmmca_abort (Scsi_Cmnd *); | 17 | static int ibmmca_abort (Scsi_Cmnd *); |