diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-13 00:07:25 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-13 00:07:25 -0300 |
| commit | b0911c1c5c58cedafe9ce4f70d82282b590bfe21 (patch) | |
| tree | 2b130bf1436fae203bfcbdf2ac81459afa79ae42 /linux/drivers/media | |
| parent | e671695e92889f4471901f0fd96b4495d60a6022 (diff) | |
| parent | 9530df584100d25f5fabb1ff5e13f35200458112 (diff) | |
| download | mediapointer-dvb-s2-b0911c1c5c58cedafe9ce4f70d82282b590bfe21.tar.gz mediapointer-dvb-s2-b0911c1c5c58cedafe9ce4f70d82282b590bfe21.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tveeprom
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/tveeprom.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c index 81a85035f..e38bda67a 100644 --- a/linux/drivers/media/video/tveeprom.c +++ b/linux/drivers/media/video/tveeprom.c @@ -323,10 +323,12 @@ audioIC[] = {AUDIO_CHIP_INTERNAL, "CX25843"}, {AUDIO_CHIP_INTERNAL, "CX23418"}, {AUDIO_CHIP_INTERNAL, "CX23885"}, - /* 40-42 */ + /* 40-44 */ {AUDIO_CHIP_INTERNAL, "CX23888"}, {AUDIO_CHIP_INTERNAL, "SAA7131"}, {AUDIO_CHIP_INTERNAL, "CX23887"}, + {AUDIO_CHIP_INTERNAL, "SAA7164"}, + {AUDIO_CHIP_INTERNAL, "AU8522"}, }; /* This list is supplied by Hauppauge. Thanks! */ @@ -345,8 +347,10 @@ static const char *decoderIC[] = { "CX882", "TVP5150A", "CX25840", "CX25841", "CX25842", /* 30-34 */ "CX25843", "CX23418", "NEC61153", "CX23885", "CX23888", - /* 35-37 */ - "SAA7131", "CX25837", "CX23887" + /* 35-39 */ + "SAA7131", "CX25837", "CX23887", "CX23885A", "CX23887A", + /* 40-42 */ + "SAA7164", "CX23885B", "AU8522" }; static int hasRadioTuner(int tunerType) |