Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:19:09 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c
Log Message:
pdev is ifdef'd out, so ifdef out the declaration too
Author: Maya Rashish <[email protected]>
Committer: Taylor R Campbell <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 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.37 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.38
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.37 Sun Dec 19 11:19:01 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Sun Dec 19 11:19:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.c,v 1.37 2021/12/19 11:19:01 riastradh Exp $ */
+/* $NetBSD: i915_drv.c,v 1.38 2021/12/19 11:19:09 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.37 2021/12/19 11:19:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.38 2021/12/19 11:19:09 riastradh Exp $");
#include <linux/acpi.h>
#include <linux/device.h>
@@ -1971,7 +1971,9 @@ int i915_drm_resume(struct drm_device *d
int i915_drm_resume_early(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = to_i915(dev);
+#ifndef __NetBSD__
struct pci_dev *pdev = dev_priv->drm.pdev;
+#endif
int ret;
/*
