Merge tag 'v4.0-rc1' into patchwork

[mirror_ubuntu-artful-kernel.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 686d3277dad123113d5464b1f00bb4e5b3d8b069..40990058b4bcbea309826ca360272c53a0c02b47 100644 (file)
--- 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;