diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-16 01:24:37 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-16 01:24:37 +0400 |
| commit | ca994a36f585432458ead9133fcfe05440edbb7b (patch) | |
| tree | be05512153a9cd5cbe1f1234bc09fd9cd388ec58 /drivers/media/video/omap3isp/ispccp2.h | |
| parent | 12325280dfeba18164f9c47e226a40ab34e23ee7 (diff) | |
| parent | 2504a6423b9ab4c36df78227055995644de19edb (diff) | |
| download | linux-ca994a36f585432458ead9133fcfe05440edbb7b.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/debugfs_sta.c
net/mac80211/sta_info.h
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 { struct isp_video video_in; struct isp_csiphy *phy; struct regulator *vdds_csib; - unsigned int error; enum isp_pipeline_stream_state state; wait_queue_head_t wait; atomic_t stopping; @@ -94,6 +93,6 @@ void omap3isp_ccp2_cleanup(struct isp_device *isp); int omap3isp_ccp2_register_entities(struct isp_ccp2_device *ccp2, struct v4l2_device *vdev); void omap3isp_ccp2_unregister_entities(struct isp_ccp2_device *ccp2); -int omap3isp_ccp2_isr(struct isp_ccp2_device *ccp2); +void omap3isp_ccp2_isr(struct isp_ccp2_device *ccp2); #endif /* OMAP3_ISP_CCP2_H */ |