Module Name: src Committed By: skrll Date: Wed Sep 7 07:03:37 UTC 2016
Modified Files: src/sys/arch/arm/amlogic [netbsd-7-nhusb]: amlogic_dwctwo.c Log Message: Adapt to branch To generate a diff of this commit: cvs rdiff -u -r1.2.2.2 -r1.2.2.2.4.1 \ src/sys/arch/arm/amlogic/amlogic_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/arm/amlogic/amlogic_dwctwo.c diff -u src/sys/arch/arm/amlogic/amlogic_dwctwo.c:1.2.2.2 src/sys/arch/arm/amlogic/amlogic_dwctwo.c:1.2.2.2.4.1 --- src/sys/arch/arm/amlogic/amlogic_dwctwo.c:1.2.2.2 Sat Mar 21 08:51:17 2015 +++ src/sys/arch/arm/amlogic/amlogic_dwctwo.c Wed Sep 7 07:03:37 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: amlogic_dwctwo.c,v 1.2.2.2 2015/03/21 08:51:17 snj Exp $ */ +/* $NetBSD: amlogic_dwctwo.c,v 1.2.2.2.4.1 2016/09/07 07:03:37 skrll Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: amlogic_dwctwo.c,v 1.2.2.2 2015/03/21 08:51:17 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: amlogic_dwctwo.c,v 1.2.2.2.4.1 2016/09/07 07:03:37 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -112,7 +112,7 @@ amlogic_dwctwo_attach(device_t parent, d sc->sc_dwc2.sc_iot = aio->aio_core_bst; bus_space_subregion(aio->aio_core_bst, aio->aio_bsh, loc->loc_offset, loc->loc_size, &sc->sc_dwc2.sc_ioh); - sc->sc_dwc2.sc_bus.dmatag = aio->aio_dmat; + sc->sc_dwc2.sc_bus.ub_dmatag = aio->aio_dmat; sc->sc_dwc2.sc_params = &amlogic_dwctwo_params; aprint_naive("\n");