diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-06 08:12:07 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-06 08:12:07 -0300 |
| commit | 18c7475db040fb0ed62df174b6831aea290f2479 (patch) | |
| tree | 5a79d04339d7d6289fc5acc3921032b999884004 /linux/drivers/media/video/saa7134/saa7134-dvb.c | |
| parent | fbcd7beea764d905edd7aec98388395e0d112a9d (diff) | |
| parent | fa78f832b219585b0c8df60fa718e52ae8212bdd (diff) | |
| download | mediapointer-dvb-s2-18c7475db040fb0ed62df174b6831aea290f2479.tar.gz mediapointer-dvb-s2-18c7475db040fb0ed62df174b6831aea290f2479.tar.bz2 | |
merge: http://kernellabs.com/hg/~pboettcher/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-dvb.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-dvb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c index 360fbdf19..a5263c391 100644 --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c @@ -1119,7 +1119,7 @@ static int dvb_init(struct saa7134_dev *dev) &tda827x_cfg_2) < 0) goto dettach_frontend; break; - case SAA7134_BOARD_HAUPPAUGE_HVR1110R3: + case SAA7134_BOARD_HAUPPAUGE_HVR1120: fe0->dvb.frontend = dvb_attach(tda10048_attach, &hcw_tda10048_config, &dev->i2c_adap); @@ -1147,7 +1147,7 @@ static int dvb_init(struct saa7134_dev *dev) &tda827x_cfg_1) < 0) goto dettach_frontend; break; - case SAA7134_BOARD_HAUPPAUGE_HVR1120: + case SAA7134_BOARD_HAUPPAUGE_HVR1150: fe0->dvb.frontend = dvb_attach(lgdt3305_attach, &hcw_lgdt3305_config, &dev->i2c_adap); |