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/ultrastor.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/ultrastor.h')
| -rw-r--r-- | drivers/scsi/ultrastor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ultrastor.h b/drivers/scsi/ultrastor.h index 0a0f8df9e871..da759a11deff 100644 --- a/drivers/scsi/ultrastor.h +++ b/drivers/scsi/ultrastor.h | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #ifndef _ULTRASTOR_H | 13 | #ifndef _ULTRASTOR_H |
| 14 | #define _ULTRASTOR_H | 14 | #define _ULTRASTOR_H |
| 15 | 15 | ||
| 16 | static int ultrastor_detect(Scsi_Host_Template *); | 16 | static int ultrastor_detect(struct scsi_host_template *); |
| 17 | static const char *ultrastor_info(struct Scsi_Host * shpnt); | 17 | static const char *ultrastor_info(struct Scsi_Host * shpnt); |
| 18 | static int ultrastor_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); | 18 | static int ultrastor_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); |
| 19 | static int ultrastor_abort(Scsi_Cmnd *); | 19 | static int ultrastor_abort(Scsi_Cmnd *); |