[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau Fix bad merge.

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9de7eb1d484b
branches:  trunk
changeset: 835076:9de7eb1d484b
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:31:29 2018 +0000

description:
Fix bad merge.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_abi16.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r a5fffc4d5168 -r 9de7eb1d484b sys/external/bsd/drm2/dist/drm/nouveau/nouveau_abi16.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_abi16.c    Mon Aug 27 07:31:17 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_abi16.c    Mon Aug 27 07:31:29 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_abi16.c,v 1.3 2018/08/27 04:58:24 riastradh Exp $      */
+/*     $NetBSD: nouveau_abi16.c,v 1.4 2018/08/27 07:31:29 riastradh Exp $      */
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_abi16.c,v 1.3 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_abi16.c,v 1.4 2018/08/27 07:31:29 riastradh Exp $");
 
 #include <nvif/client.h>
 #include <nvif/driver.h>
@@ -509,8 +509,8 @@
        struct nouveau_abi16_ntfy *ntfy;
        struct nvif_device *device = &abi16->device;
        struct nvif_client *client;
-       static const struct nv_dma_class zero_args;
-       struct nv_dma_class args = zero_args;
+       static const struct nv_dma_v0 zero_args;
+       struct nv_dma_v0 args = zero_args;
        int ret;
 
        if (unlikely(!abi16))