diff options
Diffstat (limited to 'drivers/media/video/s5p-fimc/fimc-core.h')
-rw-r--r-- | drivers/media/video/s5p-fimc/fimc-core.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-core.h b/drivers/media/video/s5p-fimc/fimc-core.h index 288631a86e53..ef7c6a23ca2a 100644 --- a/drivers/media/video/s5p-fimc/fimc-core.h +++ b/drivers/media/video/s5p-fimc/fimc-core.h | |||
@@ -331,7 +331,7 @@ struct fimc_vid_cap { | |||
331 | struct fimc_ctx *ctx; | 331 | struct fimc_ctx *ctx; |
332 | struct vb2_alloc_ctx *alloc_ctx; | 332 | struct vb2_alloc_ctx *alloc_ctx; |
333 | struct video_device *vfd; | 333 | struct video_device *vfd; |
334 | struct v4l2_subdev *subdev; | 334 | struct v4l2_subdev subdev; |
335 | struct media_pad vd_pad; | 335 | struct media_pad vd_pad; |
336 | struct v4l2_mbus_framefmt mf; | 336 | struct v4l2_mbus_framefmt mf; |
337 | struct media_pad sd_pads[FIMC_SD_PADS_NUM]; | 337 | struct media_pad sd_pads[FIMC_SD_PADS_NUM]; |
@@ -737,9 +737,8 @@ void fimc_m2m_job_finish(struct fimc_ctx *ctx, int vb_state); | |||
737 | 737 | ||
738 | /* -----------------------------------------------------*/ | 738 | /* -----------------------------------------------------*/ |
739 | /* fimc-capture.c */ | 739 | /* fimc-capture.c */ |
740 | int fimc_register_capture_device(struct fimc_dev *fimc, | 740 | int fimc_initialize_capture_subdev(struct fimc_dev *fimc); |
741 | struct v4l2_device *v4l2_dev); | 741 | void fimc_unregister_capture_subdev(struct fimc_dev *fimc); |
742 | void fimc_unregister_capture_device(struct fimc_dev *fimc); | ||
743 | int fimc_capture_ctrls_create(struct fimc_dev *fimc); | 742 | int fimc_capture_ctrls_create(struct fimc_dev *fimc); |
744 | void fimc_sensor_notify(struct v4l2_subdev *sd, unsigned int notification, | 743 | void fimc_sensor_notify(struct v4l2_subdev *sd, unsigned int notification, |
745 | void *arg); | 744 | void *arg); |