diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-03 23:54:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-03 23:54:56 -0400 |
| commit | 73561695b2e77473e353a5ae63bab81ed5098d8e (patch) | |
| tree | d039affaa54d38985e41566e4d62e0aa6a170287 /include/media/video-buf-dvb.h | |
| parent | 6f2f38128170814e151cfedf79532e19cd179567 (diff) | |
| parent | 8be3de3fd8469154a2b3e18a4712032dac5b4a53 (diff) | |
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
Diffstat (limited to 'include/media/video-buf-dvb.h')
| -rw-r--r-- | include/media/video-buf-dvb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/video-buf-dvb.h b/include/media/video-buf-dvb.h index 94bd33619aa5..ad0a07a3a895 100644 --- a/include/media/video-buf-dvb.h +++ b/include/media/video-buf-dvb.h | |||
| @@ -16,7 +16,7 @@ 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; | 19 | struct dvb_adapter adapter; |
| 20 | struct dvb_demux demux; | 20 | struct dvb_demux demux; |
| 21 | struct dmxdev dmxdev; | 21 | struct dmxdev dmxdev; |
| 22 | struct dmx_frontend fe_hw; | 22 | struct dmx_frontend fe_hw; |