From: Paul Sokolovsky Date: Fri, 12 Apr 2013 23:28:26 +0000 (-0500) Subject: drm.h: Fix DRM compilation with bare-metal toolchain. X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b6330548383cf18d608faf1c2dc0c81c60476233;p=linux-beck.git drm.h: Fix DRM compilation with bare-metal toolchain. An ifdef in drm.h expects to be compiled with full-fledged Linux toolchain, but it's common to compile kernel with just bare-metal toolchain which doesn't define __linux__. So, also add __KERNEL__ check. [nm@ti.com: port forward to 3.9-rc6 and post to dri devel for feedback as RFC] Signed-off-by: Paul Sokolovsky Signed-off-by: Dave Airlie --- diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index 8d1e2bbee83a..73a99e4664be 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -36,7 +36,7 @@ #ifndef _DRM_H_ #define _DRM_H_ -#if defined(__linux__) +#if defined(__KERNEL__) || defined(__linux__) #include #include