diff options
| author | Angus Ainslie <angus.ainslie@linaro.org> | 2011-11-29 15:41:06 -0700 |
|---|---|---|
| committer | Angus Ainslie <angus.ainslie@linaro.org> | 2011-11-29 15:53:20 -0700 |
| commit | 3944375f9f03e7a1438479d0130d0d0f3411514e (patch) | |
| tree | 77147f7861a7dd5fb321f1819ca6a0aa51e63482 | |
| parent | afef040f90a7f5b2a8117cf6d656f2785ee46db2 (diff) | |
Fix build failures3.2-samsung2
Signed-off-by: Angus Ainslie <angus.ainslie@linaro.org>
| -rw-r--r-- | drivers/media/video/s5p-tv/mixer_video.c | 1 | ||||
| -rw-r--r-- | include/drm/drm.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/s5p-tv/mixer_video.c b/drivers/media/video/s5p-tv/mixer_video.c index e16d3a4bc1dc..8dc1f3c7b721 100644 --- a/drivers/media/video/s5p-tv/mixer_video.c +++ b/drivers/media/video/s5p-tv/mixer_video.c @@ -17,6 +17,7 @@ #include <linux/videodev2.h> #include <linux/mm.h> #include <linux/version.h> +#include <linux/module.h> #include <linux/timer.h> #include <media/videobuf2-dma-contig.h> diff --git a/include/drm/drm.h b/include/drm/drm.h index 4be33b4ca2f8..4eb719e93803 100644 --- a/include/drm/drm.h +++ b/include/drm/drm.h @@ -36,7 +36,7 @@ #ifndef _DRM_H_ #define _DRM_H_ -#if defined(__linux__) +#if defined(__KERNEL__) #include <linux/types.h> #include <asm/ioctl.h> |