Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:33:53 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/include/linux: module.h
Log Message:
Include <sys/module.h> first in <linux/module.h>.
If not, later includes of <sys/module.h> will fail because
<linux/module.h> defines a Linux macro module_init that causes the
prototype for our function module_init to evaporate.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/include/linux/module.h
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/include/linux/module.h
diff -u src/sys/external/bsd/drm2/include/linux/module.h:1.5 src/sys/external/bsd/drm2/include/linux/module.h:1.6
--- src/sys/external/bsd/drm2/include/linux/module.h:1.5 Wed Nov 12 02:24:40 2014
+++ src/sys/external/bsd/drm2/include/linux/module.h Mon Aug 27 07:33:53 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: module.h,v 1.5 2014/11/12 02:24:40 christos Exp $ */
+/* $NetBSD: module.h,v 1.6 2018/08/27 07:33:53 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -32,6 +32,9 @@
#ifndef _LINUX_MODULE_H_
#define _LINUX_MODULE_H_
+/* XXX Get this first so we don't nuke the module_init declaration. */
+#include <sys/module.h>
+
#include <linux/export.h>
#include <linux/moduleparam.h>
