[src/trunk]: src/sys/external/bsd/drm2/dist/uapi/drm Don't redefine __u64 &c....

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

details:   https://anonhg.NetBSD.org/src/rev/73a93d39e7b0
branches:  trunk
changeset: 332347:73a93d39e7b0
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Sep 17 15:36:04 2014 +0000

description:
Don't redefine __u64 &c. here if we included <linux/types.h>.

diffstat:

 sys/external/bsd/drm2/dist/uapi/drm/drm.h |  2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diffs (19 lines):

diff -r 3921d02bcb43 -r 73a93d39e7b0 sys/external/bsd/drm2/dist/uapi/drm/drm.h
--- a/sys/external/bsd/drm2/dist/uapi/drm/drm.h Wed Sep 17 11:37:28 2014 +0000
+++ b/sys/external/bsd/drm2/dist/uapi/drm/drm.h Wed Sep 17 15:36:04 2014 +0000
@@ -53,6 +53,7 @@
 #ifdef __NetBSD__
 #include <sys/ioccom.h>
 #include <sys/types.h>
+#ifndef _KERNEL
 typedef int8_t   __s8;
 typedef uint8_t  __u8;
 typedef int16_t  __s16;
@@ -65,6 +66,7 @@
 #    define    __user
 #  endif
 #endif
+#endif
 
 #define DRM_NAME       "drm"     /**< Name in kernel, /dev, and /proc */
 #define DRM_MIN_ORDER  5         /**< At least 2^5 bytes = 32 bytes */