summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
Diffstat (limited to 'include/media')
-rw-r--r--include/media/msm_cam_sensor.h15
-rw-r--r--include/media/msmb_generic_buf_mgr.h4
2 files changed, 2 insertions, 17 deletions
diff --git a/include/media/msm_cam_sensor.h b/include/media/msm_cam_sensor.h
index 2c8b651147e0..75d0912aa459 100644
--- a/include/media/msm_cam_sensor.h
+++ b/include/media/msm_cam_sensor.h
@@ -41,7 +41,6 @@ struct msm_camera_sensor_slave_info32 {
uint8_t is_init_params_valid;
struct msm_sensor_init_params sensor_init_params;
enum msm_sensor_output_format_t output_format;
- uint8_t bypass_video_node_creation;
};
struct msm_camera_csid_lut_params32 {
@@ -84,15 +83,6 @@ struct msm_ir_cut_cfg_data_t32 {
enum msm_ir_cut_cfg_type_t cfg_type;
};
-struct msm_laser_led_cfg_data_t32 {
- enum msm_laser_led_cfg_type_t cfg_type;
- compat_uptr_t setting;
- compat_uptr_t debug_reg;
- uint32_t debug_reg_size;
- uint16_t i2c_addr;
- enum i2c_freq_mode_t i2c_freq_mode;
-};
-
struct eeprom_read_t32 {
compat_uptr_t dbuffer;
uint32_t num_bytes;
@@ -285,10 +275,7 @@ struct msm_flash_cfg_data_t32 {
#define VIDIOC_MSM_IR_CUT_CFG32 \
_IOWR('V', BASE_VIDIOC_PRIVATE + 15, struct msm_ir_cut_cfg_data_t32)
-
-#define VIDIOC_MSM_LASER_LED_CFG32 \
- _IOWR('V', BASE_VIDIOC_PRIVATE + 16, struct msm_laser_led_cfg_data_t32)
-
#endif
#endif
+
diff --git a/include/media/msmb_generic_buf_mgr.h b/include/media/msmb_generic_buf_mgr.h
index 3cb82668acde..6588420fd6fd 100644
--- a/include/media/msmb_generic_buf_mgr.h
+++ b/include/media/msmb_generic_buf_mgr.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2016, 2018 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2016, 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
@@ -43,8 +43,6 @@ struct msm_buf_mngr_info32_t {
#define VIDIOC_MSM_BUF_MNGR_FLUSH32 \
_IOWR('V', BASE_VIDIOC_PRIVATE + 39, struct msm_buf_mngr_info32_t)
-#define VIDIOC_MSM_BUF_MNGR_BUF_ERROR32 \
- _IOWR('V', BASE_VIDIOC_PRIVATE + 41, struct msm_buf_mngr_info32_t)
#endif
#endif