diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
| commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
| tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /drivers/scsi/ultrastor.h | |
| parent | 36b35a5be0e4b406acd816e2122d153e875105be (diff) | |
| parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/scsi/ultrastor.h')
| -rw-r--r-- | drivers/scsi/ultrastor.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/scsi/ultrastor.h b/drivers/scsi/ultrastor.h index da759a11deff..a692905f95f7 100644 --- a/drivers/scsi/ultrastor.h +++ b/drivers/scsi/ultrastor.h | |||
| @@ -14,11 +14,13 @@ | |||
| 14 | #define _ULTRASTOR_H | 14 | #define _ULTRASTOR_H |
| 15 | 15 | ||
| 16 | static int ultrastor_detect(struct 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(struct scsi_cmnd *, |
| 19 | static int ultrastor_abort(Scsi_Cmnd *); | 19 | void (*done)(struct scsi_cmnd *)); |
| 20 | static int ultrastor_host_reset(Scsi_Cmnd *); | 20 | static int ultrastor_abort(struct scsi_cmnd *); |
| 21 | static int ultrastor_biosparam(struct scsi_device *, struct block_device *, sector_t, int *); | 21 | static int ultrastor_host_reset(struct scsi_cmnd *); |
| 22 | static int ultrastor_biosparam(struct scsi_device *, struct block_device *, | ||
| 23 | sector_t, int *); | ||
| 22 | 24 | ||
| 23 | 25 | ||
| 24 | #define ULTRASTOR_14F_MAX_SG 16 | 26 | #define ULTRASTOR_14F_MAX_SG 16 |