Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Need <linux/module.h> fo...



details:   https://anonhg.NetBSD.org/src/rev/20a86795f189
branches:  trunk
changeset: 992663:20a86795f189
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:25:06 2018 +0000

description:
Need <linux/module.h> for THIS_MODULE.  Use a working struct device pointer.

diffstat:

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

diffs (30 lines):

diff -r 165cb2fa93d4 -r 20a86795f189 sys/external/bsd/drm2/dist/drm/i915/intel_csr.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c   Mon Aug 27 07:24:54 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_csr.c   Mon Aug 27 07:25:06 2018 +0000
@@ -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 @@
 
        /* 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) {



Home | Main Index | Thread Index | Old Index