diff options
Diffstat (limited to 'drivers/media/video/omap3isp/ispccp2.h')
-rw-r--r-- | drivers/media/video/omap3isp/ispccp2.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/omap3isp/ispccp2.h b/drivers/media/video/omap3isp/ispccp2.h index 6674e9de2cd7..76d65f4576ef 100644 --- a/drivers/media/video/omap3isp/ispccp2.h +++ b/drivers/media/video/omap3isp/ispccp2.h | |||
@@ -82,7 +82,6 @@ struct isp_ccp2_device { | |||
82 | struct isp_video video_in; | 82 | struct isp_video video_in; |
83 | struct isp_csiphy *phy; | 83 | struct isp_csiphy *phy; |
84 | struct regulator *vdds_csib; | 84 | struct regulator *vdds_csib; |
85 | unsigned int error; | ||
86 | enum isp_pipeline_stream_state state; | 85 | enum isp_pipeline_stream_state state; |
87 | wait_queue_head_t wait; | 86 | wait_queue_head_t wait; |
88 | atomic_t stopping; | 87 | atomic_t stopping; |
@@ -94,6 +93,6 @@ void omap3isp_ccp2_cleanup(struct isp_device *isp); | |||
94 | int omap3isp_ccp2_register_entities(struct isp_ccp2_device *ccp2, | 93 | int omap3isp_ccp2_register_entities(struct isp_ccp2_device *ccp2, |
95 | struct v4l2_device *vdev); | 94 | struct v4l2_device *vdev); |
96 | void omap3isp_ccp2_unregister_entities(struct isp_ccp2_device *ccp2); | 95 | void omap3isp_ccp2_unregister_entities(struct isp_ccp2_device *ccp2); |
97 | int omap3isp_ccp2_isr(struct isp_ccp2_device *ccp2); | 96 | void omap3isp_ccp2_isr(struct isp_ccp2_device *ccp2); |
98 | 97 | ||
99 | #endif /* OMAP3_ISP_CCP2_H */ | 98 | #endif /* OMAP3_ISP_CCP2_H */ |