From 45861c76435e465bf89d0d3db0e7115a7d51540a Mon Sep 17 00:00:00 2001
From: Ethan Chen <intervigil@gmail.com>
Date: Thu, 24 Oct 2013 16:52:42 -0700
Subject: [PATCH] exynos5: Add kernel headers to include path

Change-Id: Ided9ea5f0ce73a000f1f7b7b8f665edf3efcf90a
---
 include/ExynosCamera.h           | 4 ++--
 libgscaler/Android.mk            | 4 ++++
 libscaler/libscaler-m2m1shot.cpp | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/ExynosCamera.h b/include/ExynosCamera.h
index 0d28021..e6b95b5 100644
--- a/include/ExynosCamera.h
+++ b/include/ExynosCamera.h
@@ -56,8 +56,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <videodev2.h>
-#include <videodev2_exynos_camera.h>
+#include <linux/videodev2.h>
+#include <linux/videodev2_exynos_camera.h>
 #include <linux/vt.h>
 
 #include <utils/RefBase.h>
diff --git a/libgscaler/Android.mk b/libgscaler/Android.mk
index c1d7f2f..d72c138 100644
--- a/libgscaler/Android.mk
+++ b/libgscaler/Android.mk
@@ -25,11 +25,15 @@ LOCAL_SHARED_LIBRARIES += libMcClient
 LOCAL_STATIC_LIBRARIES := libsecurepath
 
 LOCAL_C_INCLUDES := \
+	$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \
 	$(LOCAL_PATH)/../include \
 	$(TOP)/hardware/samsung_slsi/exynos/include \
 	$(TOP)/hardware/samsung_slsi/exynos/libexynosutils \
 	$(TOP)/hardware/samsung_slsi/exynos/libmpp
 
+LOCAL_ADDITIONAL_DEPENDENCIES := \
+	$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
 LOCAL_SRC_FILES := \
 	libgscaler_obj.cpp \
 	libgscaler.cpp
diff --git a/libscaler/libscaler-m2m1shot.cpp b/libscaler/libscaler-m2m1shot.cpp
index 74d4b92..86dd043 100644
--- a/libscaler/libscaler-m2m1shot.cpp
+++ b/libscaler/libscaler-m2m1shot.cpp
@@ -30,7 +30,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#include <videodev2.h>
+#include <linux/videodev2.h>
 
 #include <exynos_scaler.h>
 
-- 
2.20.1