diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 15:16:27 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 15:16:27 -0500 |
| commit | 5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859 (patch) | |
| tree | 63429c2222a55509dc81269233bbe7a321bb86ed /drivers/media/video/saa7134/saa7134-dvb.c | |
| parent | 23a56e2cbec2860ef02d6720508fbcb07accc8b4 (diff) | |
| parent | ce4b50f2fc62267eeaf331c41bc11b92d9bc7865 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-dvb.c')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-dvb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c index 399f9952596c..1a536e865277 100644 --- a/drivers/media/video/saa7134/saa7134-dvb.c +++ b/drivers/media/video/saa7134/saa7134-dvb.c | |||
| @@ -861,7 +861,7 @@ static int dvb_init(struct saa7134_dev *dev) | |||
| 861 | dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config, | 861 | dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config, |
| 862 | &dev->i2c_adap); | 862 | &dev->i2c_adap); |
| 863 | break; | 863 | break; |
| 864 | case SAA7134_BOARD_THYPHOON_DVBT_DUO_CARDBUS: | 864 | case SAA7134_BOARD_FLYDVBT_DUO_CARDBUS: |
| 865 | dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config, | 865 | dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config, |
| 866 | &dev->i2c_adap); | 866 | &dev->i2c_adap); |
| 867 | break; | 867 | break; |