From 6d61efe5e3b9bf52671ff4bb20cda1528f966f51 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 12 Nov 2008 15:18:41 +0100 Subject: [PATCH] --- yaml --- r: 120351 b: refs/heads/master c: 11843ee4d5ee130b84de01c019dde7bf0a3eca78 h: refs/heads/master i: 120349: a71ad7f4c6cd5244b610ccc5c46633a63c9e629f 120347: 1ae7c9da8c865ecc2cc968d8e3ffa9257640b640 120343: afaa82bfb920307b01ecd047772d0e7ee2d5d933 120335: c56fa322d45b92959f72d31aaa04870d42a1275c 120319: e3a4434cffc07c13b2d2231387676e9852bfe484 v: v3 --- [refs] | 2 +- trunk/sound/ppc/tumbler.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 79102353f3bf..81b9fdd6d325 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7d26f84cb76b962217ce277c3e3a9748a26ac11 +refs/heads/master: 11843ee4d5ee130b84de01c019dde7bf0a3eca78 diff --git a/trunk/sound/ppc/tumbler.c b/trunk/sound/ppc/tumbler.c index f746e15b8481..3eb223385416 100644 --- a/trunk/sound/ppc/tumbler.c +++ b/trunk/sound/ppc/tumbler.c @@ -875,7 +875,8 @@ static struct snd_kcontrol_new snapper_mixers[] __initdata = { .put = tumbler_put_master_switch }, DEFINE_SNAPPER_MIX("PCM Playback Volume", 0, VOL_IDX_PCM), - DEFINE_SNAPPER_MIX("PCM Playback Volume", 1, VOL_IDX_PCM2), + /* Alternative PCM is assigned to Mic analog loopback on iBook G4 */ + DEFINE_SNAPPER_MIX("Mic Playback Volume", 0, VOL_IDX_PCM2), DEFINE_SNAPPER_MIX("Monitor Mix Volume", 0, VOL_IDX_ADC), DEFINE_SNAPPER_MONO("Tone Control - Bass", bass), DEFINE_SNAPPER_MONO("Tone Control - Treble", treble),