diff options
Diffstat (limited to 'include/media/videobuf-dvb.h')
-rw-r--r-- | include/media/videobuf-dvb.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/media/videobuf-dvb.h b/include/media/videobuf-dvb.h index 1a401f7320b9..069215c77a65 100644 --- a/include/media/videobuf-dvb.h +++ b/include/media/videobuf-dvb.h | |||
@@ -16,7 +16,6 @@ struct videobuf_dvb { | |||
16 | int nfeeds; | 16 | int nfeeds; |
17 | 17 | ||
18 | /* videobuf_dvb_(un)register manges this */ | 18 | /* videobuf_dvb_(un)register manges this */ |
19 | struct dvb_adapter adapter; | ||
20 | struct dvb_demux demux; | 19 | struct dvb_demux demux; |
21 | struct dmxdev dmxdev; | 20 | struct dmxdev dmxdev; |
22 | struct dmx_frontend fe_hw; | 21 | struct dmx_frontend fe_hw; |
@@ -25,17 +24,17 @@ struct videobuf_dvb { | |||
25 | }; | 24 | }; |
26 | 25 | ||
27 | struct videobuf_dvb_frontend { | 26 | struct videobuf_dvb_frontend { |
28 | void *dev; | ||
29 | struct list_head felist; | 27 | struct list_head felist; |
28 | void *dev; | ||
30 | int id; | 29 | int id; |
31 | struct videobuf_dvb dvb; | 30 | struct videobuf_dvb dvb; |
32 | }; | 31 | }; |
33 | 32 | ||
34 | struct videobuf_dvb_frontends { | 33 | struct videobuf_dvb_frontends { |
34 | struct list_head felist; | ||
35 | struct mutex lock; | 35 | struct mutex lock; |
36 | struct dvb_adapter adapter; | 36 | struct dvb_adapter adapter; |
37 | int active_fe_id; /* Indicates which frontend in the felist is in use */ | 37 | int active_fe_id; /* Indicates which frontend in the felist is in use */ |
38 | struct videobuf_dvb_frontend frontend; | ||
39 | int gate; /* Frontend with gate control 0=!MFE,1=fe0,2=fe1 etc */ | 38 | int gate; /* Frontend with gate control 0=!MFE,1=fe0,2=fe1 etc */ |
40 | }; | 39 | }; |
41 | 40 | ||