Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into...

[linux-2.6-block.git] / drivers / media / dvb-core / dvb_net.c

diff --git a/drivers/media/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_net.c
index 4a77cb02dffc3edeb42cc8cff8c8ad10af38306b..a694fb1ea2287b56d7d7bc272937688208d19786 100644 (file)
--- a/drivers/media/dvb-core/dvb_net.c
+++ b/drivers/media/dvb-core/dvb_net.c
@@ -1461,14 +1461,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;