[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Fix multiple typos in me...

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

details:   https://anonhg.NetBSD.org/src/rev/844342afacfe
branches:  trunk
changeset: 992683:844342afacfe
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:29:20 2018 +0000

description:
Fix multiple typos in merge attepmt.

diffstat:

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

diffs (30 lines):

diff -r 8b988bc15c59 -r 844342afacfe sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c        Mon Aug 27 07:29:09 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_uncore.c        Mon Aug 27 07:29:20 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_uncore.c,v 1.7 2018/08/27 04:58:24 riastradh Exp $       */
+/*     $NetBSD: intel_uncore.c,v 1.8 2018/08/27 07:29:20 riastradh Exp $       */
 
 /*
  * Copyright © 2013 Intel Corporation
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_uncore.c,v 1.7 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_uncore.c,v 1.8 2018/08/27 07:29:20 riastradh Exp $");
 
 #include "i915_drv.h"
 #include "intel_drv.h"
@@ -1299,9 +1299,9 @@
        struct drm_i915_private *const dev_priv = dev->dev_private;
        unsigned i;
 
-       for (i = 0; i < FW_DOMAIN_ID_COUNT) {
+       for (i = 0; i < FW_DOMAIN_ID_COUNT; i++) {
                if (dev_priv->uncore.fw_domains & (1u << i))
-                       teardown_timer(&dev_priv->uncore.fw_domwin[i].timer);
+                       teardown_timer(&dev_priv->uncore.fw_domain[i].timer);
        }
 #endif
 }