Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:42:54 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drm_legacy.h
src/sys/external/bsd/drm2/include/drm: drm_os_netbsd.h
Log Message:
Include the legacy DRM_READ/WRITE in drm_legacy.h, not drm_os_*.h.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h
cvs rdiff -u -r1.7 -r1.8 \
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/drm_legacy.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h:1.4 src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h:1.5
--- src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h:1.4 Mon Aug 27 06:39:16 2018
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h Mon Aug 27 06:42:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_legacy.h,v 1.4 2018/08/27 06:39:16 riastradh Exp $ */
+/* $NetBSD: drm_legacy.h,v 1.5 2018/08/27 06:42:54 riastradh Exp $ */
#ifndef __DRM_DRM_LEGACY_H__
#define __DRM_DRM_LEGACY_H__
@@ -269,4 +269,8 @@ static __inline__ struct drm_local_map *
return NULL;
}
+#ifdef __NetBSD__
+#include <drm/drm_iomap_netbsd.h>
+#endif
+
#endif /* __DRM_DRM_LEGACY_H__ */
Index: src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h
diff -u src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.7 src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.8
--- src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h:1.7 Mon Aug 27 06:19:26 2018
+++ src/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Mon Aug 27 06:42:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_os_netbsd.h,v 1.7 2018/08/27 06:19:26 riastradh Exp $ */
+/* $NetBSD: drm_os_netbsd.h,v 1.8 2018/08/27 06:42:54 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -60,7 +60,6 @@
#include <drm/drm_agp_netbsd.h>
#include <drm/drm_auth_netbsd.h>
#include <drm/drm_copy_netbsd.h>
-#include <drm/drm_iomap_netbsd.h>
#include <drm/drm_irq_netbsd.h>
#include <drm/drm_wait_netbsd.h>
