diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 23:38:52 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 23:38:52 -0500 |
commit | 0da36b3467040908d3df6bc1f5b4d592a8b23b63 (patch) | |
tree | 4843991fa3a67d9e3cbdfd39eb50574ce8b82c6e /drivers/scsi/arm/scsi.h | |
parent | 8006fdd6dc387abaa4b683bda4868c879fd76070 (diff) | |
parent | cd52d1ee9a92587b242d946a2300a3245d3b885a (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/arm/scsi.h')
-rw-r--r-- | drivers/scsi/arm/scsi.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/arm/scsi.h b/drivers/scsi/arm/scsi.h index 19937640e2e7..6dd544a5eb56 100644 --- a/drivers/scsi/arm/scsi.h +++ b/drivers/scsi/arm/scsi.h @@ -18,7 +18,7 @@ * The scatter-gather list handling. This contains all * the yucky stuff that needs to be fixed properly. */ -static inline int copy_SCp_to_sg(struct scatterlist *sg, Scsi_Pointer *SCp, int max) +static inline int copy_SCp_to_sg(struct scatterlist *sg, struct scsi_pointer *SCp, int max) { int bufs = SCp->buffers_residual; @@ -32,7 +32,7 @@ static inline int copy_SCp_to_sg(struct scatterlist *sg, Scsi_Pointer *SCp, int return bufs + 1; } -static inline int next_SCp(Scsi_Pointer *SCp) +static inline int next_SCp(struct scsi_pointer *SCp) { int ret = SCp->buffers_residual; if (ret) { @@ -49,7 +49,7 @@ static inline int next_SCp(Scsi_Pointer *SCp) return ret; } -static inline unsigned char get_next_SCp_byte(Scsi_Pointer *SCp) +static inline unsigned char get_next_SCp_byte(struct scsi_pointer *SCp) { char c = *SCp->ptr; @@ -59,7 +59,7 @@ static inline unsigned char get_next_SCp_byte(Scsi_Pointer *SCp) return c; } -static inline void put_next_SCp_byte(Scsi_Pointer *SCp, unsigned char c) +static inline void put_next_SCp_byte(struct scsi_pointer *SCp, unsigned char c) { *SCp->ptr = c; SCp->ptr += 1; |