cam.diff

diff --git a/include/media/camera2.h b/include/media/camera2.h
index 1e8281e..b077f96 100644
--- a/include/media/camera2.h
+++ b/include/media/camera2.h
@@ -105,8 +105,10 @@ struct msm_camera_sensor_board_info {
 	const char *eeprom_name;
 	const char *actuator_name;
 	const char *ois_name;
+#ifndef CONFIG_HUAWEI_KERNEL
 	const char *special_support_sensors[MAX_SPECIAL_SUPPORT_SIZE];
 	int32_t special_support_size ;
+#endif
 	struct msm_camera_slave_info *slave_info;
 	struct msm_camera_csi_lane_params *csi_lane_params;
 	struct msm_camera_sensor_strobe_flash_data *strobe_flash_data;
diff --git a/include/media/msm_cam_sensor.h b/include/media/msm_cam_sensor.h
index 742218f..752c6b9 100644
--- a/include/media/msm_cam_sensor.h
+++ b/include/media/msm_cam_sensor.h
@@ -372,8 +372,9 @@ struct msm_camera_sensor_slave_info32 {
 	uint8_t  is_init_params_valid;
 	struct msm_sensor_init_params sensor_init_params;
 	uint8_t is_flash_supported;
+#ifndef CONFIG_HUAWEI_KERNEL
 	enum msm_sensor_output_format_t output_format;
-#ifdef CONFIG_HUAWEI_KERNEL
+#else
 	compat_uptr_t sensor_cam_id;
 	compat_uptr_t dump_reg_info;
 	uint16_t dump_reg_num;
@@ -423,7 +424,11 @@ struct msm_eeprom_cfg_data32 {
 	enum eeprom_cfg_type_t cfgtype;
 	uint8_t is_supported;
 	union {
+#ifdef CONFIG_HUAWEI_KIWI
 		char eeprom_name[MAX_EEPROM_NAME];
+#else
+		char eeprom_name[MAX_SENSOR_NAME];
+#endif
 		struct eeprom_get_t get_data;
 		struct eeprom_read_t32 read_data;
 		struct eeprom_write_t32 write_data;
@@ -821,7 +826,9 @@ struct msm_camera_i2c_reg_setting32 {
 	enum msm_camera_i2c_reg_addr_type addr_type;
 	enum msm_camera_i2c_data_type data_type;
 	uint16_t delay;
+#ifndef CONFIG_HUAWEI_KIWI
 	enum msm_camera_qup_i2c_write_batch_t qup_i2c_batch;
+#endif
 };
 
 struct msm_actuator_tuning_params_t32 {
diff --git a/include/media/msm_camsensor_sdk.h b/include/media/msm_camsensor_sdk.h
index 210fca0..777739b 100644
--- a/include/media/msm_camsensor_sdk.h
+++ b/include/media/msm_camsensor_sdk.h
@@ -4,8 +4,11 @@
 #include <linux/v4l2-mediabus.h>
 
 #define KVERSION 0x1
-
+#ifdef CONFIG_HUAWEI_KERNEL
+#define MAX_POWER_CONFIG      15
+#else
 #define MAX_POWER_CONFIG      12
+#endif
 #define GPIO_OUT_LOW          (0 << 1)
 #define GPIO_OUT_HIGH         (1 << 1)
 #define CSI_EMBED_DATA        0x12
@@ -29,7 +32,11 @@
 #define MAX_ACTUATOR_SCENARIO     8
 #define MAX_ACT_MOD_NAME_SIZE     32
 #define MAX_ACT_NAME_SIZE         32
+#ifdef CONFIG_HUAWEI_KERNEL
+#define MAX_ACTUATOR_INIT_SET     12
+#else
 #define MAX_ACTUATOR_INIT_SET     32
+#endif
 #define MAX_I2C_REG_SET           12
 
 #define MAX_NAME_SIZE             32
@@ -270,8 +277,9 @@ struct msm_camera_sensor_slave_info {
 	uint8_t  is_init_params_valid;
 	struct msm_sensor_init_params sensor_init_params;
 	uint8_t is_flash_supported;
+#ifndef CONFIG_HUAWEI_KERNEL
 	enum msm_sensor_output_format_t output_format;
-#ifdef CONFIG_HUAWEI_KERNEL
+#else
 	struct msm_sensor_cam_id_t *sensor_cam_id;
 	struct dump_reg_info_t *dump_reg_info;
 	uint16_t dump_reg_num;
@@ -303,7 +311,9 @@ struct msm_camera_i2c_reg_setting {
 	enum msm_camera_i2c_reg_addr_type addr_type;
 	enum msm_camera_i2c_data_type data_type;
 	uint16_t delay;
+#ifndef CONFIG_HUAWEI_KERNEL
 	enum msm_camera_qup_i2c_write_batch_t qup_i2c_batch;
+#endif
 };
 
 struct msm_camera_csid_vc_cfg {
diff --git a/include/uapi/media/msm_camera.h b/include/uapi/media/msm_camera.h
index 3aff71ef..27c894fcb 100644
--- a/include/uapi/media/msm_camera.h
+++ b/include/uapi/media/msm_camera.h
@@ -278,7 +278,11 @@ struct msm_mctl_post_proc_cmd {
 #define NUM_ACTUATOR_DIR 2
 #define MAX_ACTUATOR_SCENARIO 8
 #define MAX_ACTUATOR_REGION 5
+#ifndef CONFIG_HUAWEI_KERNEL
 #define MAX_ACTUATOR_INIT_SET 32
+#else
+#define MAX_ACTUATOR_INIT_SET 12
+#endif
 #define MAX_ACTUATOR_TYPE_SIZE 32
 #define MAX_ACTUATOR_REG_TBL_SIZE 8