[src/trunk]: src/sys/external/bsd/drm2/include/drm Include the legacy DRM_REA...

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

details:   https://anonhg.NetBSD.org/src/rev/f8934a97eb82
branches:  trunk
changeset: 992478:f8934a97eb82
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 06:42:54 2018 +0000

description:
Include the legacy DRM_READ/WRITE in drm_legacy.h, not drm_os_*.h.

diffstat:

 sys/external/bsd/drm2/dist/include/drm/drm_legacy.h |  6 +++++-
 sys/external/bsd/drm2/include/drm/drm_os_netbsd.h   |  3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 3b114b7c2625 -r f8934a97eb82 sys/external/bsd/drm2/dist/include/drm/drm_legacy.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h       Mon Aug 27 06:42:41 2018 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h       Mon Aug 27 06:42:54 2018 +0000
@@ -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 @@
        return NULL;
 }
 
+#ifdef __NetBSD__
+#include <drm/drm_iomap_netbsd.h>
+#endif
+
 #endif /* __DRM_DRM_LEGACY_H__ */
diff -r 3b114b7c2625 -r f8934a97eb82 sys/external/bsd/drm2/include/drm/drm_os_netbsd.h
--- a/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Mon Aug 27 06:42:41 2018 +0000
+++ b/sys/external/bsd/drm2/include/drm/drm_os_netbsd.h Mon Aug 27 06:42:54 2018 +0000
@@ -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>