diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-11-21 06:44:57 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-11-21 06:44:56 -0800 |
| commit | f79329e286535417c07ca4ae005a79164002ddd4 (patch) | |
| tree | 9b8e7f4cd5e6d42395ae1a91b8d18d47c78c993e /include | |
| parent | c4f4e49994e59567202c97c358cd1a9faad6bad5 (diff) | |
| parent | c884da03cc44118b28d63e1fe81563dd1ee94b4b (diff) | |
Merge "Revert "ais: query field info and pass to user space""
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/msm_ba.h | 3 | ||||
| -rw-r--r-- | include/uapi/media/ais/msm_ais_isp.h | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/media/msm_ba.h b/include/media/msm_ba.h index e13509585e5a..d630e441590f 100644 --- a/include/media/msm_ba.h +++ b/include/media/msm_ba.h @@ -18,9 +18,6 @@ #include <media/v4l2-device.h> #include <linux/poll.h> -/* Control ID to fetch register Values */ -#define VIDIOC_CVBS_G_FIELD_STATUS _IOR('V', BASE_VIDIOC_PRIVATE + 5, int) - enum msm_ba_ip { BA_IP_CVBS_0 = 0, BA_IP_CVBS_1, diff --git a/include/uapi/media/ais/msm_ais_isp.h b/include/uapi/media/ais/msm_ais_isp.h index e093e84ed3f8..f323d3bf7baf 100644 --- a/include/uapi/media/ais/msm_ais_isp.h +++ b/include/uapi/media/ais/msm_ais_isp.h @@ -23,8 +23,7 @@ #define ISP_STATS_STREAM_BIT 0x80000000 -#define INTERLACE_SUPPORT -#define INTERLACE_OFFSET (1) +#define INTERLACE_SUPPORT_OLD_REMOVED struct msm_vfe_cfg_cmd_list; |