Module Name: src
Committed By: riastradh
Date: Wed Jul 24 03:51:04 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [riastradh-drm2]: i915_irq.c
src/sys/external/bsd/drm2/drm [riastradh-drm2]: drm_module.c
src/sys/external/bsd/drm2/i915drm [riastradh-drm2]: i915_module.c
Log Message:
i915_irq.c needs <linux/printk.h.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/external/bsd/drm2/drm/drm_module.c
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 \
src/sys/external/bsd/drm2/i915drm/i915_module.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_irq.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.1.1.1.2.3 src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.1.1.1.2.4
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.1.1.1.2.3 Wed Jul 24 03:06:00 2013
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c Wed Jul 24 03:51:04 2013
@@ -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>
Index: src/sys/external/bsd/drm2/drm/drm_module.c
diff -u src/sys/external/bsd/drm2/drm/drm_module.c:1.1.2.4 src/sys/external/bsd/drm2/drm/drm_module.c:1.1.2.5
--- src/sys/external/bsd/drm2/drm/drm_module.c:1.1.2.4 Wed Jul 24 03:31:12 2013
+++ src/sys/external/bsd/drm2/drm/drm_module.c Wed Jul 24 03:51:04 2013
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: drm_module.c
* 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 @@ MODULE(MODULE_CLASS_MISC, drm, "iic,pci"
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;
Index: src/sys/external/bsd/drm2/i915drm/i915_module.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_module.c:1.1.2.4 src/sys/external/bsd/drm2/i915drm/i915_module.c:1.1.2.5
--- src/sys/external/bsd/drm2/i915drm/i915_module.c:1.1.2.4 Wed Jul 24 03:49:57 2013
+++ src/sys/external/bsd/drm2/i915drm/i915_module.c Wed Jul 24 03:51:04 2013
@@ -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"
