summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-05 08:35:50 -0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-10 07:23:41 -0200
commit2773b0e9baa68beed1f93d04a8ae8ca04b35a60d (patch)
tree19325d3942b4e40d188d31410f862568479627e6 /include/media
parentde39078779cb08b21e7e3d2daa7d3b64a53a8d20 (diff)
downloadlinux-stable-2773b0e9baa68beed1f93d04a8ae8ca04b35a60d.tar.gz
linux-stable-2773b0e9baa68beed1f93d04a8ae8ca04b35a60d.tar.bz2
linux-stable-2773b0e9baa68beed1f93d04a8ae8ca04b35a60d.zip
[media] add media controller support to videobuf2-dvb
Allow devices to pass an optional argument to register the DVB driver at the media controller. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/videobuf2-dvb.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/media/videobuf2-dvb.h b/include/media/videobuf2-dvb.h
index 5b64c9eac2c9..87b559024b4a 100644
--- a/include/media/videobuf2-dvb.h
+++ b/include/media/videobuf2-dvb.h
@@ -8,6 +8,10 @@
#include <dvb_frontend.h>
#include <media/videobuf2-v4l2.h>
+
+/* We don't actually need to include media-device.h here */
+struct media_device;
+
/*
* TODO: This header file should be replaced with videobuf2-core.h
* Currently, vb2_thread is not a stuff of videobuf2-core,
@@ -50,6 +54,7 @@ int vb2_dvb_register_bus(struct vb2_dvb_frontends *f,
struct module *module,
void *adapter_priv,
struct device *device,
+ struct media_device *mdev,
short *adapter_nr,
int mfe_shared);