summaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorPaul Sokolovsky <paul.sokolovsky@linaro.org>2013-04-13 01:28:26 +0200
committerDave Airlie <airlied@redhat.com>2013-04-16 05:15:26 +0200
commitb6330548383cf18d608faf1c2dc0c81c60476233 (patch)
treee0c9e9871642c763ee03c7f712deb0926917b4f9 /include/uapi
parentdrm: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT (diff)
downloadlinux-b6330548383cf18d608faf1c2dc0c81c60476233.tar.xz
linux-b6330548383cf18d608faf1c2dc0c81c60476233.zip
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 <paul.sokolovsky@linaro.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/drm/drm.h2
1 files changed, 1 insertions, 1 deletions
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 <linux/types.h>
#include <asm/ioctl.h>