---

yaml --- r: 120351 b: refs/heads/master c: 11843ee h: refs/heads/master i: 120349: a71ad7f 120347: 1ae7c9d 120343: afaa82b 120335: c56fa32 120319: e3a4434 v: v3
git-mirror · Nov 12, 2008 · 6d61efe · 6d61efe
1 parent ca88401
commit 6d61efe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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),