diff options
author | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
commit | 23e735bc7b0e1d614656881794257b4224efda3a (patch) | |
tree | d9523b531156fedb204e31b4612519b0a7a003e7 /drivers/scsi/arm/scsi.h | |
parent | 3906f4edeef976c081c4e7bd92164d2f59c325ae (diff) | |
parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
download | linux-23e735bc7b0e1d614656881794257b4224efda3a.tar.gz linux-23e735bc7b0e1d614656881794257b4224efda3a.tar.bz2 linux-23e735bc7b0e1d614656881794257b4224efda3a.zip |
Merge ../linus
Diffstat (limited to 'drivers/scsi/arm/scsi.h')
-rw-r--r-- | drivers/scsi/arm/scsi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/arm/scsi.h b/drivers/scsi/arm/scsi.h index 6dd544a5eb56..8c2600ffc6af 100644 --- a/drivers/scsi/arm/scsi.h +++ b/drivers/scsi/arm/scsi.h @@ -74,7 +74,7 @@ static inline void init_SCp(Scsi_Cmnd *SCpnt) unsigned long len = 0; int buf; - SCpnt->SCp.buffer = (struct scatterlist *) SCpnt->buffer; + SCpnt->SCp.buffer = (struct scatterlist *) SCpnt->request_buffer; SCpnt->SCp.buffers_residual = SCpnt->use_sg - 1; SCpnt->SCp.ptr = (char *) (page_address(SCpnt->SCp.buffer->page) + |