am b39943bf: am a61de09c: Merge "Move videodev2.h to include/linux."
* commit 'b39943bf1902f5ff6967f55721066f787465f035':
Move videodev2.h to include/linux.
diff --git a/include/ExynosCamera.h b/include/ExynosCamera.h
index 0d28021..3a91f04 100644
--- a/include/ExynosCamera.h
+++ b/include/ExynosCamera.h
@@ -56,7 +56,7 @@
#include <sys/stat.h>
#include <sys/types.h>
-#include <videodev2.h>
+#include <linux/videodev2.h>
#include <videodev2_exynos_camera.h>
#include <linux/vt.h>
diff --git a/include/ExynosJpegApi.h b/include/ExynosJpegApi.h
index dbbd188..e54dcde 100644
--- a/include/ExynosJpegApi.h
+++ b/include/ExynosJpegApi.h
@@ -18,7 +18,7 @@
#ifndef __EXYNOS_JPEG_BASE_H__
#define __EXYNOS_JPEG_BASE_H__
-#include "videodev2.h"
+#include <linux/videodev2.h>
#include "videodev2_exynos_media.h"
#define JPEG_CACHE_OFF (0)
diff --git a/include/exynos_v4l2.h b/include/exynos_v4l2.h
index 22c06ce..bd297a1 100644
--- a/include/exynos_v4l2.h
+++ b/include/exynos_v4l2.h
@@ -41,7 +41,7 @@
/* V4L2 */
#include <stdbool.h>
-#include "videodev2.h" /* vendor specific videodev2.h */
+#include <linux/videodev2.h> /* vendor specific videodev2.h */
#include "videodev2_exynos_media.h"
/*! \ingroup exynos_v4l2 */
diff --git a/include/videodev2.h b/include/linux/videodev2.h
similarity index 100%
rename from include/videodev2.h
rename to include/linux/videodev2.h
diff --git a/include/s5p_fimc_v4l2.h b/include/s5p_fimc_v4l2.h
index d0c5d5f..1a06ef9 100644
--- a/include/s5p_fimc_v4l2.h
+++ b/include/s5p_fimc_v4l2.h
@@ -20,7 +20,7 @@
#ifndef _S5P_FIMC_H_
#define _S5P_FIMC_H_
-#include "videodev2.h"
+#include <linux/videodev2.h>
#include "videodev2_exynos_media.h"
/*
diff --git a/include/s5p_tvout_v4l2.h b/include/s5p_tvout_v4l2.h
index d11db09..d3c5129 100644
--- a/include/s5p_tvout_v4l2.h
+++ b/include/s5p_tvout_v4l2.h
@@ -19,7 +19,7 @@
#include <linux/fb.h>
-#include "videodev2.h"
+#include <linux/videodev2.h>
#include "videodev2_exynos_media.h"
#ifdef __cplusplus
diff --git a/libexynosutils/exynos5_format_v4l2.c b/libexynosutils/exynos5_format_v4l2.c
index f40bfd8..4649038 100644
--- a/libexynosutils/exynos5_format_v4l2.c
+++ b/libexynosutils/exynos5_format_v4l2.c
@@ -41,7 +41,7 @@
#include "exynos_format.h"
#include "s5p_fimc_v4l2.h"
#include <utils/Log.h>
-#include "videodev2.h"
+#include <linux/videodev2.h>
#include "videodev2_exynos_media.h"
int HAL_PIXEL_FORMAT_2_V4L2_PIX(
diff --git a/libgscaler/exynos_gsc_utils.h b/libgscaler/exynos_gsc_utils.h
index d49152d..8c0217f 100644
--- a/libgscaler/exynos_gsc_utils.h
+++ b/libgscaler/exynos_gsc_utils.h
@@ -27,7 +27,7 @@
#include <sys/types.h>
#include <sys/ioctl.h>
-#include <videodev2.h>
+#include <linux/videodev2.h>
#include <fcntl.h>
#include <stdbool.h>
#include <string.h>
diff --git a/librotator/exynos_rotator.c b/librotator/exynos_rotator.c
index ba2b880..8b2818e 100644
--- a/librotator/exynos_rotator.c
+++ b/librotator/exynos_rotator.c
@@ -33,7 +33,7 @@
#include <sys/types.h>
#include <sys/ioctl.h>
-#include <videodev2.h>
+#include <linux/videodev2.h>
#include <fcntl.h>
#include <stdbool.h>
#include <string.h>