[src/trunk]: src/sys/external/bsd/drm2 just include linux/err.h instead of ma...

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

details:   https://anonhg.NetBSD.org/src/rev/a3c2499502b9
branches:  trunk
changeset: 834862:a3c2499502b9
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 06:43:24 2018 +0000

description:
just include linux/err.h instead of matching side loading

(it's included by fence.h, for example)

switch void* -> char* because of void pointer arithmetic.


Author: coypu <coypu%sdf.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/include/drm/drmP.h  |  3 ++-
 sys/external/bsd/drm2/include/linux/firmware.h |  4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r c39b3d7f81df -r a3c2499502b9 sys/external/bsd/drm2/dist/include/drm/drmP.h
--- a/sys/external/bsd/drm2/dist/include/drm/drmP.h     Mon Aug 27 06:43:10 2018 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drmP.h     Mon Aug 27 06:43:24 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drmP.h,v 1.18 2018/08/27 06:42:41 riastradh Exp $      */
+/*     $NetBSD: drmP.h,v 1.19 2018/08/27 06:43:24 riastradh Exp $      */
 
 /*
  * Internal Header for the Direct Rendering Manager
@@ -40,6 +40,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/file.h>
 #include <linux/fs.h>
+#include <linux/err.h>
 #include <linux/highmem.h>
 #include <linux/idr.h>
 #include <linux/init.h>
diff -r c39b3d7f81df -r a3c2499502b9 sys/external/bsd/drm2/include/linux/firmware.h
--- a/sys/external/bsd/drm2/include/linux/firmware.h    Mon Aug 27 06:43:10 2018 +0000
+++ b/sys/external/bsd/drm2/include/linux/firmware.h    Mon Aug 27 06:43:24 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: firmware.h,v 1.6 2014/08/06 13:51:12 riastradh Exp $   */
+/*     $NetBSD: firmware.h,v 1.7 2018/08/27 06:43:24 riastradh Exp $   */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
 struct device;
 
 struct firmware {
-       void                    *data;
+       char                    *data;
        size_t                  size;
 };