diff options
| author | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2013-04-12 19:28:26 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-04-15 23:15:26 -0400 |
| commit | b6330548383cf18d608faf1c2dc0c81c60476233 (patch) | |
| tree | e0c9e9871642c763ee03c7f712deb0926917b4f9 /include/uapi | |
| parent | 025df7755472dc5ee9ebc5aa7023eba4b4ef3e3b (diff) | |
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.h | 2 |
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 @@ | |||
| 36 | #ifndef _DRM_H_ | 36 | #ifndef _DRM_H_ |
| 37 | #define _DRM_H_ | 37 | #define _DRM_H_ |
| 38 | 38 | ||
| 39 | #if defined(__linux__) | 39 | #if defined(__KERNEL__) || defined(__linux__) |
| 40 | 40 | ||
| 41 | #include <linux/types.h> | 41 | #include <linux/types.h> |
| 42 | #include <asm/ioctl.h> | 42 | #include <asm/ioctl.h> |