summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-03-03 12:30:51 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-03-03 12:30:51 -0300
commita77bf7048addfbd59ec2208f3172207d90d42c9a (patch)
tree12fd7e00aa58066eb935ceed3f7d0426e8cca9ef /include/media
parent76413791a03f8fd8a3d793db135e19b6c2239664 (diff)
downloadtalos-obmc-linux-a77bf7048addfbd59ec2208f3172207d90d42c9a.tar.gz
talos-obmc-linux-a77bf7048addfbd59ec2208f3172207d90d42c9a.zip
v4l2-mc.h: Add stubs for the V4L2 PM/pipeline routines
Let's add stubs for the case where the Kernel gets compiled without MEDIA_CONTROLLER. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/v4l2-mc.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/include/media/v4l2-mc.h b/include/media/v4l2-mc.h
index 406f845034b9..144b152e0362 100644
--- a/include/media/v4l2-mc.h
+++ b/include/media/v4l2-mc.h
@@ -207,7 +207,7 @@ int v4l2_pipeline_pm_use(struct media_entity *entity, int use);
int v4l2_pipeline_link_notify(struct media_link *link, u32 flags,
unsigned int notification);
-#else
+#else /* CONFIG_MEDIA_CONTROLLER */
static inline int v4l2_mc_create_media_graph(struct media_device *mdev)
{
@@ -228,5 +228,17 @@ static int v4l_vb2q_enable_media_source(struct vb2_queue *q)
{
return 0;
}
-#endif
+
+int v4l2_pipeline_pm_use(struct media_entity *entity, int use);
+{
+ return 0;
+}
+
+int v4l2_pipeline_link_notify(struct media_link *link, u32 flags,
+ unsigned int notification);
+{
+ return 0;
+}
+
+#endif /* CONFIG_MEDIA_CONTROLLER */
#endif /* _V4L2_MC_H */
OpenPOWER on IntegriCloud