V4L/DVB (3436): Remove 'dvbdev' from struct dmxdev_filter

[deliverable/linux.git] / drivers / media / dvb / dvb-core / dmxdev.h

diff --git a/drivers/media/dvb/dvb-core/dmxdev.h b/drivers/media/dvb/dvb-core/dmxdev.h
index ec2a7a4da5e4448b30b345385eb01f78bcdd9f1a..5d4d18a00a6855b016fbbda2f5c42a1cac9038f5 100644 (file)
--- a/drivers/media/dvb/dvb-core/dmxdev.h
+++ b/drivers/media/dvb/dvb-core/dmxdev.h
@@ -62,8 +62,6 @@ struct dmxdev_buffer {
 };
 
 struct dmxdev_filter {
-       struct dvb_device *dvbdev;
-
        union {
                struct dmx_section_filter *sec;
        } filter;
@@ -89,15 +87,6 @@ struct dmxdev_filter {
        struct timer_list timer;
        int todo;
        u8 secheader[3];
-
-       u16 pid;
-};
-
-
-struct dmxdev_dvr {
-       int state;
-       struct dmxdev *dev;
-       struct dmxdev_buffer buffer;
 };
 
 
@@ -106,7 +95,6 @@ struct dmxdev {
        struct dvb_device *dvr_dvbdev;
 
        struct dmxdev_filter *filter;
-       struct dmxdev_dvr *dvr;
        struct dmx_demux *demux;
 
        int filternum;