diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 01:11:23 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 01:11:23 -0400 |
| commit | 7b7e394185014e0f3bd8989cac937003f20ef9ce (patch) | |
| tree | 3beda5f979bba0aa9822534e239cf1b45f3be69c /drivers/media/video/saa7134/saa7134-dvb.c | |
| parent | ddc5d3414593e4d7ad7fbd33e7f7517fcc234544 (diff) | |
| parent | 693f7d362055261882659475d2ef022e32edbff1 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-dvb.c')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-dvb.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c index 86cfdb8514cb..222a36c38917 100644 --- a/drivers/media/video/saa7134/saa7134-dvb.c +++ b/drivers/media/video/saa7134/saa7134-dvb.c | |||
| @@ -1064,6 +1064,10 @@ static int dvb_init(struct saa7134_dev *dev) | |||
| 1064 | dev->dvb.frontend = tda10046_attach(&tevion_dvbt220rf_config, | 1064 | dev->dvb.frontend = tda10046_attach(&tevion_dvbt220rf_config, |
| 1065 | &dev->i2c_adap); | 1065 | &dev->i2c_adap); |
| 1066 | break; | 1066 | break; |
| 1067 | case SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS: | ||
| 1068 | dev->dvb.frontend = tda10046_attach(&ads_tech_duo_config, | ||
| 1069 | &dev->i2c_adap); | ||
| 1070 | break; | ||
| 1067 | #endif | 1071 | #endif |
| 1068 | #ifdef HAVE_NXT200X | 1072 | #ifdef HAVE_NXT200X |
| 1069 | case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180: | 1073 | case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180: |