Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[karo-tx-linux.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 44225b186f6df4a42945a8f9998361558d470451..e17cb85d3ecfd67983b7e4051e42fc38eefcb759 100644 (file)
--- a/drivers/media/dvb-core/dvb_net.c
+++ b/drivers/media/dvb-core/dvb_net.c
@@ -1044,7 +1044,7 @@ static int dvb_net_feed_start(struct net_device *dev)
                ret = priv->tsfeed->set(priv->tsfeed,
                                        priv->pid, /* pid */
                                        TS_PACKET, /* type */
-                                       DMX_TS_PES_OTHER, /* pes type */
+                                       DMX_PES_OTHER, /* pes type */
                                        32768,     /* circular buffer size */
                                        timeout    /* timeout */
                                        );