diff options
| author | Tejun Heo <tj@kernel.org> | 2016-05-09 12:34:39 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-05-09 12:34:39 -0400 |
| commit | 698f6700a6f19ba4550a722eaacf9f9d212b3fd9 (patch) | |
| tree | ff63c9a23fe47870df8788ff5e7d9a552f6d4ed1 /drivers/media/v4l2-core/v4l2-mc.c | |
| parent | 7780081c1f04a4ea31331b5579ca010cc1f26c74 (diff) | |
| parent | 13f307711b127d30fcf333a04365a217baf9ca2b (diff) | |
Merge branch '4.7/scsi-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi into for-4.7-zac
Pulling in the dependencies for further ZAC changes.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/media/v4l2-core/v4l2-mc.c')
| -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; |