diff options
Diffstat (limited to 'include/soc')
| -rw-r--r-- | include/soc/qcom/camera2.h | 5 | ||||
| -rw-r--r-- | include/soc/qcom/smem.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/soc/qcom/camera2.h b/include/soc/qcom/camera2.h index 5a61d2b372c3..d6b3311d3b42 100644 --- a/include/soc/qcom/camera2.h +++ b/include/soc/qcom/camera2.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2011-2015, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -105,11 +105,10 @@ struct msm_camera_power_ctrl_t { struct camera_vreg_t *cam_vreg; int num_vreg; struct msm_camera_i2c_conf *i2c_conf; - struct clk **clk_ptr; struct msm_cam_clk_info *clk_info; struct msm_pinctrl_info pinctrl_info; uint8_t cam_pinctrl_status; - size_t clk_info_size; + uint16_t clk_info_size; }; enum msm_camera_actuator_name { diff --git a/include/soc/qcom/smem.h b/include/soc/qcom/smem.h index 4117b0d47b0d..fe08178c56eb 100644 --- a/include/soc/qcom/smem.h +++ b/include/soc/qcom/smem.h @@ -106,6 +106,7 @@ enum { SMEM_OSS_RRCASN1_BUF2, SMEM_ID_VENDOR0, SMEM_ID_VENDOR1, + SMEM_ID_VENDOR_READ_NV = SMEM_ID_VENDOR1, SMEM_ID_VENDOR2, SMEM_HW_SW_BUILD_ID, SMEM_SMD_BASE_ID_2, |