diff options
author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-04-21 05:12:35 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-04-21 05:12:35 -0400 |
commit | 676ee36be04985062522804c2de04f0764212be6 (patch) | |
tree | 781df135c5a91a04decad1b7d53b5a925dc11522 /drivers/media/tuners/mxl5007t.h | |
parent | b18042a673e88c9457a6d1716219c2367ca447b0 (diff) | |
parent | e183201b9e917daf2530b637b2f34f1d5afb934d (diff) |
Merge branch 'patchwork' into v4l_for_linus
* patchwork: (404 commits)
[media] uvcvideo: add support for VIDIOC_QUERY_EXT_CTRL
[media] uvcvideo: fix cropcap v4l2-compliance failure
[media] media: omap3isp: remove unused clkdev
[media] coda: Add tracing support
[media] coda: drop dma_sync_single_for_device in coda_bitstream_queue
[media] coda: fix fill bitstream errors in nonstreaming case
[media] coda: call SEQ_END when the first queue is stopped
[media] coda: fail to start streaming if userspace set invalid formats
[media] coda: remove duplicate error messages for buffer allocations
[media] coda: move parameter buffer in together with context buffer allocation
[media] coda: allocate bitstream buffer from REQBUFS, size depends on the format
[media] coda: allocate per-context buffers from REQBUFS
[media] coda: use strlcpy instead of snprintf
[media] coda: bitstream payload is unsigned
[media] coda: fix double call to debugfs_remove
[media] coda: check kasprintf return value in coda_open
[media] coda: bitrate can only be set in kbps steps
[media] v4l2-mem2mem: no need to initialize b in v4l2_m2m_next_buf and v4l2_m2m_buf_remove
[media] s5p-mfc: set allow_zero_bytesused flag for vb2_queue_init
[media] coda: set allow_zero_bytesused flag for vb2_queue_init
...
Diffstat (limited to 'drivers/media/tuners/mxl5007t.h')
-rw-r--r-- | drivers/media/tuners/mxl5007t.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/tuners/mxl5007t.h b/drivers/media/tuners/mxl5007t.h index ae7037d681c5..e786d1f23ff1 100644 --- a/drivers/media/tuners/mxl5007t.h +++ b/drivers/media/tuners/mxl5007t.h | |||
@@ -77,7 +77,7 @@ struct mxl5007t_config { | |||
77 | unsigned int clk_out_enable:1; | 77 | unsigned int clk_out_enable:1; |
78 | }; | 78 | }; |
79 | 79 | ||
80 | #if IS_ENABLED(CONFIG_MEDIA_TUNER_MXL5007T) | 80 | #if IS_REACHABLE(CONFIG_MEDIA_TUNER_MXL5007T) |
81 | extern struct dvb_frontend *mxl5007t_attach(struct dvb_frontend *fe, | 81 | extern struct dvb_frontend *mxl5007t_attach(struct dvb_frontend *fe, |
82 | struct i2c_adapter *i2c, u8 addr, | 82 | struct i2c_adapter *i2c, u8 addr, |
83 | struct mxl5007t_config *cfg); | 83 | struct mxl5007t_config *cfg); |