commit 4a3b94251460fbfc66244475a5f1a54c72a9fe97
author Philippe Gravel <pgravel@codeaurora.org> Fri Mar 23 14:21:04 2012 -0700
committer Kiran Kumar H N <hurlisal@codeaurora.org> Thu Apr 12 15:44:03 2012 -0700
tree c5da0ec85184ca6ec7df47680480e43ad3b538bd
parent 66deac39b2f75cdd2a58adc964b6d6312d0b75f8

msm: camera: v4l2 updates

- Adds some protection against unexpected calls
- Update ifdef guards in msm_camera.h

Change-Id: I388822001159188a6c487f8c0deefa8fb5238249
Signed-off-by: Philippe Gravel <pgravel@codeaurora.org>
Signed-off-by: Sunil Joseph <sunilj@codeaurora.org>

include/media/msm_camera.h

diff --git a/include/media/msm_camera.h b/include/media/msm_camera.h
index 622c7d0..92323cb 100644
--- a/include/media/msm_camera.h
+++ b/include/media/msm_camera.h
@@ -18,16 +18,17 @@
 #endif
 #include <linux/types.h>
 #include <linux/ioctl.h>
+#ifdef __KERNEL__
 #include <linux/cdev.h>
+#endif
 #ifdef MSM_CAMERA_GCC
 #include <time.h>
 #else
 #include <linux/time.h>
 #endif
 
-#ifdef __KERNEL__
 #include <linux/ion.h>
-#endif
+
 #define MSM_CAM_IOCTL_MAGIC 'm'
 
 #define MSM_CAM_IOCTL_GET_SENSOR_INFO \