diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-19 06:54:00 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-19 06:54:00 -0400 |
| commit | 7063e6c717f6108c4b3fc3135a516c86ef944870 (patch) | |
| tree | ec6eec10b4dc93474100e6e366df028bd3314fda /drivers/media/dvb/bt8xx/dvb-bt8xx.h | |
| parent | 7ca0026495dbb644b4e32ede76be44072cb2bc7a (diff) | |
| parent | 05d3794aa8bd3b2c9f7920a05003c331cdeb75c5 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/media/dvb/bt8xx/dvb-bt8xx.h')
| -rw-r--r-- | drivers/media/dvb/bt8xx/dvb-bt8xx.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/drivers/media/dvb/bt8xx/dvb-bt8xx.h index 80ef189f930f..2923b3b0dd3c 100644 --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.h +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.h | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include "bttv.h" | 31 | #include "bttv.h" |
| 32 | #include "mt352.h" | 32 | #include "mt352.h" |
| 33 | #include "sp887x.h" | 33 | #include "sp887x.h" |
| 34 | #include "dst.h" | 34 | #include "dst_common.h" |
| 35 | #include "nxt6000.h" | 35 | #include "nxt6000.h" |
| 36 | #include "cx24110.h" | 36 | #include "cx24110.h" |
| 37 | #include "or51211.h" | 37 | #include "or51211.h" |
| @@ -40,7 +40,7 @@ struct dvb_bt8xx_card { | |||
| 40 | struct semaphore lock; | 40 | struct semaphore lock; |
| 41 | int nfeeds; | 41 | int nfeeds; |
| 42 | char card_name[32]; | 42 | char card_name[32]; |
| 43 | struct dvb_adapter *dvb_adapter; | 43 | struct dvb_adapter dvb_adapter; |
| 44 | struct bt878 *bt; | 44 | struct bt878 *bt; |
| 45 | unsigned int bttv_nr; | 45 | unsigned int bttv_nr; |
| 46 | struct dvb_demux demux; | 46 | struct dvb_demux demux; |