diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-02 13:12:57 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-02 13:12:57 -0400 |
| commit | 7078253c085c037c070ca4e8bc9e9e7f18aa1e84 (patch) | |
| tree | eaf56c1a77b0de6ee82e23cee4433b2c4a47e67e /include/media/video-buf-dvb.h | |
| parent | 259692bd5a2b2c2d351dd90748ba4126bc2a21b9 (diff) | |
| parent | 1e86d1c648508fd50e6c9960576b87906a7906ad (diff) | |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
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; |