Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:04:44 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c
Log Message:
Tweak ifdefs in i915_drv.c.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.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/i915_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.10 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.10 Mon Aug 27 07:04:22 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Mon Aug 27 07:04:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.c,v 1.10 2018/08/27 07:04:22 riastradh Exp $ */
+/* $NetBSD: i915_drv.c,v 1.11 2018/08/27 07:04:44 riastradh Exp $ */
/* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
*/
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.10 2018/08/27 07:04:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.11 2018/08/27 07:04:44 riastradh Exp $");
#include <linux/device.h>
#include <linux/acpi.h>
@@ -1032,6 +1032,7 @@ i915_pci_remove(struct pci_dev *pdev)
drm_put_dev(dev);
}
+#endif
#ifndef __NetBSD__
static int i915_pm_suspend(struct device *dev)
@@ -1514,6 +1515,7 @@ static int vlv_resume_prepare(struct drm
return ret;
}
+#ifndef __NetBSD__ /* XXX runtime pm */
static int intel_runtime_suspend(struct device *device)
{
struct pci_dev *pdev = to_pci_dev(device);
@@ -1654,8 +1656,7 @@ static int intel_runtime_resume(struct d
return ret;
}
-
-#endif /* __NetBSD__ */
+#endif
/*
* This function implements common functionality of runtime and system
