summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bttv-cards.c
diff options
context:
space:
mode:
authorGerd Knorr <devnull@localhost>2004-10-25 11:26:35 +0000
committerGerd Knorr <devnull@localhost>2004-10-25 11:26:35 +0000
commit500c59b431256f91f87b8c82dfa13982d08fc780 (patch)
tree4666be071a93b383ebda3b7bcab826d3a1b9adc6 /linux/drivers/media/video/bttv-cards.c
parenta3447d4616de78c449b78904b8b5e66db92f2c58 (diff)
downloadmediapointer-dvb-s2-500c59b431256f91f87b8c82dfa13982d08fc780.tar.gz
mediapointer-dvb-s2-500c59b431256f91f87b8c82dfa13982d08fc780.tar.bz2
- new saa7134 card by Nickolay V. Shmyrev
- misc stuff
Diffstat (limited to 'linux/drivers/media/video/bttv-cards.c')
-rw-r--r--linux/drivers/media/video/bttv-cards.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c
index 805cc389b..14a3be1f4 100644
--- a/linux/drivers/media/video/bttv-cards.c
+++ b/linux/drivers/media/video/bttv-cards.c
@@ -1,5 +1,5 @@
/*
- $Id: bttv-cards.c,v 1.29 2004/10/13 10:39:00 kraxel Exp $
+ $Id: bttv-cards.c,v 1.30 2004/10/25 11:26:35 kraxel Exp $
bttv-cards.c
@@ -194,6 +194,7 @@ static struct CARD {
{ 0x3060121a, BTTV_STB2, "3Dfx VoodooTV 100/ STB OEM" },
{ 0x3000144f, BTTV_MAGICTVIEW063, "(Askey Magic/others) TView99 CPH06x" },
+ { 0xa005144f, BTTV_MAGICTVIEW063, "CPH06X TView99-Card" },
{ 0x3002144f, BTTV_MAGICTVIEW061, "(Askey Magic/others) TView99 CPH05x" },
{ 0x3005144f, BTTV_MAGICTVIEW061, "(Askey Magic/others) TView99 CPH061/06L (T1/LC)" },
{ 0x5000144f, BTTV_MAGICTVIEW061, "Askey CPH050" },
@@ -2084,9 +2085,7 @@ struct tvcard bttv_tvcards[] = {
.pll = PLL_28,
.has_dvb = 1,
.no_gpioirq = 1,
-#if 0 /* untested */
.has_remote = 1,
-#endif
},{
/* ---- card 0x7c ---------------------------------- */
/* Matt Jesson <dvb@jesson.eclipse.co.uk> */