Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:25:06 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_csr.c
Log Message:
Need <linux/module.h> for THIS_MODULE. Use a working struct device pointer.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/i915/intel_csr.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_csr.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c:1.2 Mon Aug 27 04:58:24 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c Mon Aug 27 07:25:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_csr.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $ */
+/* $NetBSD: intel_csr.c,v 1.3 2018/08/27 07:25:06 riastradh Exp $ */
/*
* Copyright © 2014 Intel Corporation
@@ -24,9 +24,10 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_csr.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_csr.c,v 1.3 2018/08/27 07:25:06 riastradh Exp $");
#include <linux/firmware.h>
+#include <linux/module.h>
#include "i915_drv.h"
#include "i915_reg.h"
@@ -454,7 +455,7 @@ void intel_csr_ucode_init(struct drm_dev
/* CSR supported for platform, load firmware */
ret = request_firmware_nowait(THIS_MODULE, true, csr->fw_path,
- &dev_priv->dev->pdev->dev,
+ dev_priv->dev->dev,
GFP_KERNEL, dev_priv,
finish_csr_load);
if (ret) {
