[src/riastradh-drm2]: src/sys/external/bsd/drm2 i915_irq.c needs <linux/print...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cae7ae35d920
branches:  riastradh-drm2
changeset: 788449:cae7ae35d920
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 03:51:04 2013 +0000

description:
i915_irq.c needs <linux/printk.h.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_irq.c |  1 +
 sys/external/bsd/drm2/drm/drm_module.c         |  8 ++++----
 sys/external/bsd/drm2/i915drm/i915_module.c    |  6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diffs (72 lines):

diff -r 09c36b1544b1 -r cae7ae35d920 sys/external/bsd/drm2/dist/drm/i915/i915_irq.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c    Wed Jul 24 03:50:45 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c    Wed Jul 24 03:51:04 2013 +0000
@@ -28,6 +28,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/printk.h>
 #include <linux/sysrq.h>
 #include <linux/slab.h>
 #include <drm/drmP.h>
diff -r 09c36b1544b1 -r cae7ae35d920 sys/external/bsd/drm2/drm/drm_module.c
--- a/sys/external/bsd/drm2/drm/drm_module.c    Wed Jul 24 03:50:45 2013 +0000
+++ b/sys/external/bsd/drm2/drm/drm_module.c    Wed Jul 24 03:51:04 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_module.c,v 1.1.2.4 2013/07/24 03:31:12 riastradh Exp $     */
+/*     $NetBSD: drm_module.c,v 1.1.2.5 2013/07/24 03:51:04 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.1.2.4 2013/07/24 03:31:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.1.2.5 2013/07/24 03:51:04 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/device.h>
@@ -47,7 +47,7 @@
  * XXX Other Linux stuff should be moved to a linux compatibility
  * module on which this one depends.
  */
-MODULE(MODULE_CLASS_MISC, drm, "iic,pci");
+MODULE(MODULE_CLASS_MISC, drm2, "iic,pci");
 
 #ifdef _MODULE
 #include "ioconf.c"
@@ -56,7 +56,7 @@
 extern const struct cdevsw drm_cdevsw; /* XXX Put this in a header file?  */
 
 static int
-drm_modcmd(modcmd_t cmd, void *arg __unused)
+drm2_modcmd(modcmd_t cmd, void *arg __unused)
 {
 #ifdef _MODULE
        devmajor_t bmajor = NODEVMAJOR, cmajor = NODEVMAJOR;
diff -r 09c36b1544b1 -r cae7ae35d920 sys/external/bsd/drm2/i915drm/i915_module.c
--- a/sys/external/bsd/drm2/i915drm/i915_module.c       Wed Jul 24 03:50:45 2013 +0000
+++ b/sys/external/bsd/drm2/i915drm/i915_module.c       Wed Jul 24 03:51:04 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_module.c,v 1.1.2.4 2013/07/24 03:49:57 riastradh Exp $    */
+/*     $NetBSD: i915_module.c,v 1.1.2.5 2013/07/24 03:51:04 riastradh Exp $    */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_module.c,v 1.1.2.4 2013/07/24 03:49:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_module.c,v 1.1.2.5 2013/07/24 03:51:04 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/module.h>
 #include <sys/systm.h>
 
-MODULE(MODULE_CLASS_DRIVER, i915drm2, "drm"); /* XXX drm2, drm2pci, drm2edid */
+MODULE(MODULE_CLASS_DRIVER, i915drm2, "drm2"); /* XXX drm2pci, drm2edid */
 
 #ifdef _MODULE
 #include "ioconf.c"