Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:43:24 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h
src/sys/external/bsd/drm2/include/linux: firmware.h
Log Message:
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 <[email protected]>
Committer: Taylor R Campbell <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/include/linux/firmware.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.18 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.19
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.18 Mon Aug 27 06:42:41 2018
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Mon Aug 27 06:43:24 2018
@@ -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>
Index: src/sys/external/bsd/drm2/include/linux/firmware.h
diff -u src/sys/external/bsd/drm2/include/linux/firmware.h:1.6 src/sys/external/bsd/drm2/include/linux/firmware.h:1.7
--- src/sys/external/bsd/drm2/include/linux/firmware.h:1.6 Wed Aug 6 13:51:12 2014
+++ src/sys/external/bsd/drm2/include/linux/firmware.h Mon Aug 27 06:43:24 2018
@@ -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;
};
