diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-12 07:10:24 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-12 07:10:24 -0300 |
| commit | 9a09794eece0cb3e40b69aee140b81d87f914fc1 (patch) | |
| tree | ca92ed7735e27bbfa58a596f49e9378d230b77a0 /linux/drivers/media/video/bt8xx/bttv-cards.c | |
| parent | 3c00de0d74330e4761f5592f873d1a2b7553e8b3 (diff) | |
| parent | 883dc7792c9ded24211969d851819da1b01aaca3 (diff) | |
| download | mediapointer-dvb-s2-9a09794eece0cb3e40b69aee140b81d87f914fc1.tar.gz mediapointer-dvb-s2-9a09794eece0cb3e40b69aee140b81d87f914fc1.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/lgdt3305
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv-cards.c')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-cards.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-cards.c b/linux/drivers/media/video/bt8xx/bttv-cards.c index 6868de9bd..57448806c 100644 --- a/linux/drivers/media/video/bt8xx/bttv-cards.c +++ b/linux/drivers/media/video/bt8xx/bttv-cards.c @@ -299,6 +299,8 @@ static struct CARD { /* Duplicate PCI ID, reconfigure for this board during the eeprom read. * { 0x13eb0070, BTTV_BOARD_HAUPPAUGE_IMPACTVCB, "Hauppauge ImpactVCB" }, */ + { 0x109e036e, BTTV_BOARD_CONCEPTRONIC_CTVFMI2, "Conceptronic CTVFMi v2"}, + /* DVB cards (using pci function .1 for mpeg data xfer) */ { 0x001c11bd, BTTV_BOARD_PINNACLESAT, "Pinnacle PCTV Sat" }, { 0x01010071, BTTV_BOARD_NEBULA_DIGITV, "Nebula Electronics DigiTV" }, |