From 0288b6f43bd6c2ef4b430fa89113bbfae8b79b24 Mon Sep 17 00:00:00 2001 From: Seemanta Dutta Date: Wed, 9 Mar 2016 21:47:49 -0800 Subject: Revert "msm: camera: Update camera drivers" This reverts commit 282882c50fe26957c00bd598e8cab75d00251e2e. Signed-off-by: Seemanta Dutta --- include/soc/qcom/camera2.h | 2 +- include/uapi/Kbuild | 1 - include/uapi/media/Kbuild | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/soc/qcom/camera2.h b/include/soc/qcom/camera2.h index 03c0d34ab746..7124fa69b4d5 100644 --- a/include/soc/qcom/camera2.h +++ b/include/soc/qcom/camera2.h @@ -68,7 +68,7 @@ struct msm_cam_clk_setting { }; struct v4l2_subdev_info { - uint32_t code; + enum v4l2_mbus_pixelcode code; enum v4l2_colorspace colorspace; uint16_t fmt; uint16_t order; diff --git a/include/uapi/Kbuild b/include/uapi/Kbuild index aeb3366db4fc..245aa6e05e6a 100644 --- a/include/uapi/Kbuild +++ b/include/uapi/Kbuild @@ -13,4 +13,3 @@ header-y += drm/ header-y += xen/ header-y += scsi/ header-y += misc/ -header-y += media/ diff --git a/include/uapi/media/Kbuild b/include/uapi/media/Kbuild index 19ef4c3ea65d..83177391c4fd 100644 --- a/include/uapi/media/Kbuild +++ b/include/uapi/media/Kbuild @@ -17,3 +17,5 @@ header-y += msmb_isp.h header-y += msmb_ispif.h header-y += msmb_pproc.h header-y += msm_media_info.h +header-y += radio-iris.h +header-y += radio-iris-commands.h -- cgit v1.2.3