diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 17:04:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 17:04:37 -0500 |
commit | d72d6f1b5647258e83819b51f72fe37e2b7d7965 (patch) | |
tree | d3a08af50624d9b3e2287367b7e9f5fcc93bdce5 /drivers/scsi/ibmmca.h | |
parent | 33ddcbbfb1d9f1bf1259531ae0ba8400ea3c8ba1 (diff) | |
parent | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
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 *); |