diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 21:48:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 21:48:06 -0700 |
| commit | 9f75e1eff3edb2bb07349b94c28f4f2a6c66ca43 (patch) | |
| tree | 27a73405d3652dc6771fab28721b70e6d44ff47a /drivers/scsi/arm/scsi.h | |
| parent | b1459461f1e0abd5c28317d6bff6f2ca612a719d (diff) | |
| parent | 1b40efd772f4419fbc1a8940506424246985c333 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
Diffstat (limited to 'drivers/scsi/arm/scsi.h')
| -rw-r--r-- | drivers/scsi/arm/scsi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/arm/scsi.h b/drivers/scsi/arm/scsi.h index 48e1c4d9738..19937640e2e 100644 --- a/drivers/scsi/arm/scsi.h +++ b/drivers/scsi/arm/scsi.h @@ -10,6 +10,8 @@ * Commonly used scsi driver functions. */ +#include <linux/scatterlist.h> + #define BELT_AND_BRACES /* @@ -22,9 +24,7 @@ static inline int copy_SCp_to_sg(struct scatterlist *sg, Scsi_Pointer *SCp, int BUG_ON(bufs + 1 > max); - sg->page = virt_to_page(SCp->ptr); - sg->offset = offset_in_page(SCp->ptr); - sg->length = SCp->this_residual; + sg_set_buf(sg, SCp->ptr, SCp->this_residual); if (bufs) memcpy(sg + 1, SCp->buffer + 1, |