summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-08-11 17:41:17 +0000
committerMichael Krufky <devnull@localhost>2005-08-11 17:41:17 +0000
commit787f63b4eb1884ed0ada06556c9a6db010b87b89 (patch)
tree5c61d565988128294e808731d98591538cb1d174 /linux/drivers/media/video
parent8eb27e90e90b31267973b83302eba6d2601479d8 (diff)
downloadmediapointer-dvb-s2-787f63b4eb1884ed0ada06556c9a6db010b87b89.tar.gz
mediapointer-dvb-s2-787f63b4eb1884ed0ada06556c9a6db010b87b89.tar.bz2
* bttv-cards.c:
- card #135, DVICO FusionHDTV 5 Lite: Altered card settings to make autodetection less verbose. - card #136, Acorp Y878F: Moved subsystem id detection out of "DVB cards" area and into a more appropriate location. Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/bttv-cards.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c
index ba57d1e58..ed3ce78dc 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.67 2005/08/10 03:53:50 mchehab Exp $
+ $Id: bttv-cards.c,v 1.68 2005/08/11 17:41:17 mkrufky Exp $
bttv-cards.c
@@ -300,6 +300,8 @@ static struct CARD {
{ 0x01071805, BTTV_PICOLO_TETRA_CHIP, "Picolo Tetra Chip #3" },
{ 0x01081805, BTTV_PICOLO_TETRA_CHIP, "Picolo Tetra Chip #4" },
+ { 0x15409511, BTTV_ACORP_Y878F, "Acorp Y878F" },
+
/* likely broken, vendor id doesn't match the other magic views ...
* { 0xa0fca04f, BTTV_MAGICTVIEW063, "Guillemot Maxi TV Video 3" }, */
@@ -313,7 +315,6 @@ static struct CARD {
{ 0x07711461, BTTV_AVDVBT_771, "AVermedia AverTV DVB-T 771" },
{ 0xdb1018ac, BTTV_DVICO_DVBT_LITE, "DVICO FusionHDTV DVB-T Lite" },
{ 0xd50018ac, BTTV_DVICO_FUSIONHDTV_5_LITE, "DVICO FusionHDTV 5 Lite" },
- { 0x15409511, BTTV_ACORP_Y878F, "Acorp Y878F" },
{ 0, -1, NULL }
};
@@ -2436,6 +2437,9 @@ struct tvcard bttv_tvcards[] = {
.muxsel = { 2, 3 },
.gpiomask = 0x00e00007,
.audiomux = { 0x00400005, 0, 0, 0, 0, 0 },
+ .no_msp34xx = 1,
+ .no_tda9875 = 1,
+ .no_tda7432 = 1,
#if 0
.has_dvb = 1,
#endif