From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 30 Mar 2016 14:42:22 +0000 (+0200)
Subject: drm: Untangle __KERNEL__ guards
X-Git-Tag: v4.7-rc1~77^2~67^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=00c9672606f781f2db7e904127dcbdc2831701ca;p=karo-tx-linux.git

drm: Untangle __KERNEL__ guards

make headers_install can't handle fancy conditions, so let's simplify
things for it a bit.

Cc: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1459348943-12803-1-git-send-email-daniel.vetter@ffwll.ch
---

diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h
index 85ada499574b..fbc0818bb95b 100644
--- a/include/uapi/drm/drm.h
+++ b/include/uapi/drm/drm.h
@@ -36,7 +36,13 @@
 #ifndef _DRM_H_
 #define _DRM_H_
 
-#if defined(__KERNEL__) || defined(__linux__)
+#if defined(__KERNEL__)
+
+#include <linux/types.h>
+#include <asm/ioctl.h>
+typedef unsigned int drm_handle_t;
+
+#elif defined(__linux__)
 
 #include <linux/types.h>
 #include <asm/ioctl.h>