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

[karo-tx-linux.git] / drivers / media / dvb-core / dvb_demux.h

diff --git a/drivers/media/dvb-core/dvb_demux.h b/drivers/media/dvb-core/dvb_demux.h
index fa7188a253aa0add2f6275420391106ed51a6e83..ae7fc33c3231ec974a46d1275d38270e18b73827 100644 (file)
--- a/drivers/media/dvb-core/dvb_demux.h
+++ b/drivers/media/dvb-core/dvb_demux.h
@@ -119,8 +119,8 @@ struct dvb_demux {
 
        struct list_head frontend_list;
 
-       struct dvb_demux_feed *pesfilter[DMX_TS_PES_OTHER];
-       u16 pids[DMX_TS_PES_OTHER];
+       struct dvb_demux_feed *pesfilter[DMX_PES_OTHER];
+       u16 pids[DMX_PES_OTHER];
        int playing;
        int recording;