diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-03-11 12:55:16 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-03-31 14:50:38 -0300 |
| commit | 0fed3fcef48aff793f00aca44f366ff77fa95a01 (patch) | |
| tree | 9cfd5ae32ab7d72367e8f81ad39a4c4deb96521e /drivers/media | |
| parent | 2e208c64e3aa7abe7b79963bb29f5d14a4b96e58 (diff) | |
| download | linux-0fed3fcef48aff793f00aca44f366ff77fa95a01.tar.gz linux-0fed3fcef48aff793f00aca44f366ff77fa95a01.tar.bz2 linux-0fed3fcef48aff793f00aca44f366ff77fa95a01.zip | |
[media] v4l2-mc: cleanup a warning
A previous patch removing dtv_demod needed to be rebased,
but the hunk removing the data was not merged by mistake.
Fixes: 840f5b0572ea ('media: au0828 disable tuner to demod link in au0828_media_device_register()']
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-mc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/v4l2-core/v4l2-mc.c b/drivers/media/v4l2-core/v4l2-mc.c index 2a7b79bc90fd..2228cd3a846e 100644 --- a/drivers/media/v4l2-core/v4l2-mc.c +++ b/drivers/media/v4l2-core/v4l2-mc.c @@ -34,7 +34,7 @@ int v4l2_mc_create_media_graph(struct media_device *mdev) { struct media_entity *entity; struct media_entity *if_vid = NULL, *if_aud = NULL; - struct media_entity *tuner = NULL, *decoder = NULL, *dtv_demod = NULL; + struct media_entity *tuner = NULL, *decoder = NULL; struct media_entity *io_v4l = NULL, *io_vbi = NULL, *io_swradio = NULL; bool is_webcam = false; u32 flags; |