CVS commit: src/sys/arch/mips/cavium/dev

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Tue Apr 26 09:24:57 UTC 2016

Modified Files:
        src/sys/arch/mips/cavium/dev: octeon_dwctwo.c

Log Message:
Adapt to nick-nhusb merge


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/cavium/dev/octeon_dwctwo.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/mips/cavium/dev/octeon_dwctwo.c
diff -u src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.6 src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.7
--- src/sys/arch/mips/cavium/dev/octeon_dwctwo.c:1.6	Sun Aug 30 13:02:42 2015
+++ src/sys/arch/mips/cavium/dev/octeon_dwctwo.c	Tue Apr 26 09:24:57 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: octeon_dwctwo.c,v 1.6 2015/08/30 13:02:42 skrll Exp $	*/
+/*	$NetBSD: octeon_dwctwo.c,v 1.7 2016/04/26 09:24:57 skrll Exp $	*/
 
 /*
  * Copyright (c) 2015 Masao Uebayashi <uebay...@tombiinc.com>
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_dwctwo.c,v 1.6 2015/08/30 13:02:42 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_dwctwo.c,v 1.7 2016/04/26 09:24:57 skrll Exp $");
 
 #include "opt_octeon.h"
 #include "opt_usb.h"
@@ -173,7 +173,7 @@ octeon_dwc2_attach(device_t parent, devi
 	sc->sc_dwc2_bust.bs_w_4 = octeon_dwc2_wr_4;
 
 	sc->sc_dwc2.sc_iot = &sc->sc_dwc2_bust;
-	sc->sc_dwc2.sc_bus.dmatag = aa->aa_dmat;
+	sc->sc_dwc2.sc_bus.ub_dmatag = aa->aa_dmat;
 	sc->sc_dwc2.sc_params = &octeon_dwc2_params;
 	sc->sc_dwc2.sc_set_dma_addr = octeon_dwc2_set_dma_addr;