diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-28 13:53:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-28 13:53:19 -0800 |
| commit | 96e52d3ac88780d60ca74bb96301369b7e0c5867 (patch) | |
| tree | c157d05bb5ef861c28602f5c813510e7fd721b37 /drivers/scsi | |
| parent | e5517c2a5a49ed5e99047008629f1cd60246ea0e (diff) | |
| parent | 16f46050e7094a95554555a505a984535d253cf6 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
"Two ugly build warning fixes"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
dbri: Fix compiler warning
qlogicpti: Fix compiler warnings
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/qlogicpti.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/qlogicpti.h b/drivers/scsi/qlogicpti.h index 4377e87ee79c..892a0b058b99 100644 --- a/drivers/scsi/qlogicpti.h +++ b/drivers/scsi/qlogicpti.h @@ -356,8 +356,8 @@ struct qlogicpti { /* The rest of the elements are unimportant for performance. */ struct qlogicpti *next; - __u32 res_dvma; /* Ptr to RESPONSE bufs (DVMA)*/ - __u32 req_dvma; /* Ptr to REQUEST bufs (DVMA) */ + dma_addr_t res_dvma; /* Ptr to RESPONSE bufs (DVMA)*/ + dma_addr_t req_dvma; /* Ptr to REQUEST bufs (DVMA) */ u_char fware_majrev, fware_minrev, fware_micrev; struct Scsi_Host *qhost; int qpti_id; |