diff options
Diffstat (limited to 'sound/pci/ac97')
-rw-r--r-- | sound/pci/ac97/ac97_codec.c | 3 | ||||
-rw-r--r-- | sound/pci/ac97/ac97_patch.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 07364c00768a..8c49a00a5e39 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c | |||
@@ -161,6 +161,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = { | |||
161 | { 0x50534304, 0xffffffff, "UCB1400", patch_ucb1400, NULL }, | 161 | { 0x50534304, 0xffffffff, "UCB1400", patch_ucb1400, NULL }, |
162 | { 0x53494c20, 0xffffffe0, "Si3036,8", mpatch_si3036, mpatch_si3036, AC97_MODEM_PATCH }, | 162 | { 0x53494c20, 0xffffffe0, "Si3036,8", mpatch_si3036, mpatch_si3036, AC97_MODEM_PATCH }, |
163 | { 0x54524102, 0xffffffff, "TR28022", NULL, NULL }, | 163 | { 0x54524102, 0xffffffff, "TR28022", NULL, NULL }, |
164 | { 0x54524103, 0xffffffff, "TR28023", NULL, NULL }, | ||
164 | { 0x54524106, 0xffffffff, "TR28026", NULL, NULL }, | 165 | { 0x54524106, 0xffffffff, "TR28026", NULL, NULL }, |
165 | { 0x54524108, 0xffffffff, "TR28028", patch_tritech_tr28028, NULL }, // added by xin jin [07/09/99] | 166 | { 0x54524108, 0xffffffff, "TR28028", patch_tritech_tr28028, NULL }, // added by xin jin [07/09/99] |
166 | { 0x54524123, 0xffffffff, "TR28602", NULL, NULL }, // only guess --jk [TR28023 = eMicro EM28023 (new CT1297)] | 167 | { 0x54524123, 0xffffffff, "TR28602", NULL, NULL }, // only guess --jk [TR28023 = eMicro EM28023 (new CT1297)] |
@@ -169,7 +170,7 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = { | |||
169 | { 0x56494170, 0xffffffff, "VIA1617A", patch_vt1617a, NULL }, // modified VT1616 with S/PDIF | 170 | { 0x56494170, 0xffffffff, "VIA1617A", patch_vt1617a, NULL }, // modified VT1616 with S/PDIF |
170 | { 0x56494182, 0xffffffff, "VIA1618", NULL, NULL }, | 171 | { 0x56494182, 0xffffffff, "VIA1618", NULL, NULL }, |
171 | { 0x57454301, 0xffffffff, "W83971D", NULL, NULL }, | 172 | { 0x57454301, 0xffffffff, "W83971D", NULL, NULL }, |
172 | { 0x574d4c00, 0xffffffff, "WM9701A", NULL, NULL }, | 173 | { 0x574d4c00, 0xffffffff, "WM9701,WM9701A", NULL, NULL }, |
173 | { 0x574d4C03, 0xffffffff, "WM9703,WM9707,WM9708,WM9717", patch_wolfson03, NULL}, | 174 | { 0x574d4C03, 0xffffffff, "WM9703,WM9707,WM9708,WM9717", patch_wolfson03, NULL}, |
174 | { 0x574d4C04, 0xffffffff, "WM9704M,WM9704Q", patch_wolfson04, NULL}, | 175 | { 0x574d4C04, 0xffffffff, "WM9704M,WM9704Q", patch_wolfson04, NULL}, |
175 | { 0x574d4C05, 0xffffffff, "WM9705,WM9710", patch_wolfson05, NULL}, | 176 | { 0x574d4C05, 0xffffffff, "WM9705,WM9710", patch_wolfson05, NULL}, |
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c index 0746e9ccc20b..f4fbc795ee81 100644 --- a/sound/pci/ac97/ac97_patch.c +++ b/sound/pci/ac97/ac97_patch.c | |||
@@ -3381,8 +3381,8 @@ static struct snd_kcontrol *snd_ac97_find_mixer_ctl(struct snd_ac97 *ac97, | |||
3381 | } | 3381 | } |
3382 | 3382 | ||
3383 | /* create a virtual master control and add slaves */ | 3383 | /* create a virtual master control and add slaves */ |
3384 | int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name, | 3384 | static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name, |
3385 | const unsigned int *tlv, const char **slaves) | 3385 | const unsigned int *tlv, const char **slaves) |
3386 | { | 3386 | { |
3387 | struct snd_kcontrol *kctl; | 3387 | struct snd_kcontrol *kctl; |
3388 | const char **s; | 3388 | const char **s; |