[src/trunk]: src/sys/external/bsd/drm2/dist/drm/radeon Fix variable name-o in...

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

details:   https://anonhg.NetBSD.org/src/rev/dcba1b9407a5
branches:  trunk
changeset: 992764:dcba1b9407a5
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:43:50 2018 +0000

description:
Fix variable name-o in merge.

diffstat:

 sys/external/bsd/drm2/dist/drm/radeon/r300.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 590649e259f2 -r dcba1b9407a5 sys/external/bsd/drm2/dist/drm/radeon/r300.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/r300.c      Mon Aug 27 07:43:38 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/r300.c      Mon Aug 27 07:43:50 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: r300.c,v 1.3 2018/08/27 04:58:36 riastradh Exp $       */
+/*     $NetBSD: r300.c,v 1.4 2018/08/27 07:43:50 riastradh Exp $       */
 
 /*
  * Copyright 2008 Advanced Micro Devices, Inc.
@@ -28,7 +28,7 @@
  *          Jerome Glisse
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: r300.c,v 1.3 2018/08/27 04:58:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: r300.c,v 1.4 2018/08/27 07:43:50 riastradh Exp $");
 
 #include <linux/seq_file.h>
 #include <linux/slab.h>
@@ -143,7 +143,7 @@
        /* on x86 we want this to be CPU endian, on powerpc
         * on powerpc without HW swappers, it'll get swapped on way
         * into VRAM - so no need for cpu_to_le32 on VRAM tables */
-       writel(addr, (uint8_t __iomem *)ptr + (i * 4));
+       writel(entry, (uint8_t __iomem *)ptr + (i * 4));
 }
 
 #ifdef __NetBSD__