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
This commit is contained in:
Linus Torvalds
2016-11-28 13:53:19 -08:00
2 changed files with 18 additions and 12 deletions

View File

@@ -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;