Index: sys/external/bsd/drm2/dist/uapi/drm/drm.h
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm2/dist/uapi/drm/drm.h,v
retrieving revision 1.4
diff -p -u -r1.4 drm.h
--- sys/external/bsd/drm2/dist/uapi/drm/drm.h	16 Jul 2014 20:56:25 -0000	1.4
+++ sys/external/bsd/drm2/dist/uapi/drm/drm.h	17 Sep 2014 15:20:31 -0000
@@ -53,6 +53,7 @@ typedef unsigned int drm_handle_t;
 #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 @@ typedef uint64_t __u64;
 #    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 */