From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Date: Sat, 3 Jan 2015 01:53:58 +0000 (-0300)
Subject: [media] dvb_net: add support for DVB net node at the media controller
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e3d65c33e31db12856300cf8015428daae19245a;p=deliverable%2Flinux.git

[media] dvb_net: add support for DVB net node at the media controller

Make the dvb core network support aware of the media controller and
register the corresponding devices.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---

diff --git a/drivers/media/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_net.c
index 686d3277dad1..40990058b4bc 100644
--- a/drivers/media/dvb-core/dvb_net.c
+++ b/drivers/media/dvb-core/dvb_net.c
@@ -1462,14 +1462,16 @@ static const struct file_operations dvb_net_fops = {
 	.llseek = noop_llseek,
 };
 
-static struct dvb_device dvbdev_net = {
+static const struct dvb_device dvbdev_net = {
 	.priv = NULL,
 	.users = 1,
 	.writers = 1,
+#if defined(CONFIG_MEDIA_CONTROLLER_DVB)
+	.name = "dvb net",
+#endif
 	.fops = &dvb_net_fops,
 };
 
-
 void dvb_net_release (struct dvb_net *dvbnet)
 {
 	int i;