Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:34:15 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_display.c
Log Message:
Sweep up #endif clippings.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_display.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/external/bsd/drm2/dist/drm/i915/intel_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.18 src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.19
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.18 Mon Aug 27 06:16:22 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Mon Aug 27 06:34:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_display.c,v 1.18 2018/08/27 06:16:22 riastradh Exp $ */
+/* $NetBSD: intel_display.c,v 1.19 2018/08/27 06:34:15 riastradh Exp $ */
/*
* Copyright © 2006-2007 Intel Corporation
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.18 2018/08/27 06:16:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.19 2018/08/27 06:34:15 riastradh Exp $");
#include <linux/dmi.h>
#include <linux/module.h>
@@ -14982,7 +14982,6 @@ void i915_disable_vga(struct drm_device
vga_put(dev->pdev, VGA_RSRC_LEGACY_IO);
#endif
udelay(300);
-#endif
I915_WRITE(vga_reg, VGA_DISP_DISABLE);
POSTING_READ(vga_reg);
