Module Name: src
Committed By: riastradh
Date: Wed Jul 24 00:51:31 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm [riastradh-drm2]: drmP.h
Added Files:
src/sys/external/bsd/drm2/include/drm [riastradh-drm2]: drm_os_netbsd.h
Log Message:
Add <drm/drm_os_netbsd.h> and include it in <drm/drmP.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 \
src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r0 -r1.1.2.1 \
src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.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/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.1.1.1.2.2 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.1.1.1.2.3
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.1.1.1.2.2 Tue Jul 23 21:28:23 2013
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Wed Jul 24 00:51:31 2013
@@ -85,7 +85,11 @@ struct module;
struct drm_file;
struct drm_device;
+#ifdef __NetBSD__
+#include <drm/drm_os_netbsd.h>
+#else
#include <drm/drm_os_linux.h>
+#endif
#include <drm/drm_hashtab.h>
#include <drm/drm_mm.h>
Added files:
Index: src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h
diff -u /dev/null src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.1.2.1
--- /dev/null Wed Jul 24 00:51:31 2013
+++ src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Wed Jul 24 00:51:31 2013
@@ -0,0 +1,39 @@
+/* $NetBSD: drm_os_netbsd.h,v 1.1.2.1 2013/07/24 00:51:31 riastradh Exp $ */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _DRM_DRM_OS_NETBSD_H_
+#define _DRM_DRM_OS_NETBSD_H_
+
+#if defined(_KERNEL_OPT)
+#include "opt_drm.h"
+#endif
+
+#endif /* _DRM_DRM_OS_NETBSD_H_ */
