The patch titled
aoa: tas: change PCM1 name to PCM
has been added to the -mm tree. Its filename is
aoa-tas-change-pcm1-name-to-pcm.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: aoa: tas: change PCM1 name to PCM
From: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
This patch changes the PCM1 control name to PCM to make it play nice with the
softvol plugin (which will then go away if it sees a proper PCM slider)
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
sound/aoa/codecs/snd-aoa-codec-tas.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN sound/aoa/codecs/snd-aoa-codec-tas.c~aoa-tas-change-pcm1-name-to-pcm sound/aoa/codecs/snd-aoa-codec-tas.c
--- a/sound/aoa/codecs/snd-aoa-codec-tas.c~aoa-tas-change-pcm1-name-to-pcm
+++ a/sound/aoa/codecs/snd-aoa-codec-tas.c
@@ -309,7 +309,7 @@ static struct snd_kcontrol_new n##_contr
.private_value = idx, \
}
-MIXER_CONTROL(pcm1, "PCM1", 0);
+MIXER_CONTROL(pcm1, "PCM", 0);
MIXER_CONTROL(monitor, "Monitor", 2);
static int tas_snd_capture_source_info(struct snd_kcontrol *kcontrol,
_
Patches currently in -mm which might be from johannes@xxxxxxxxxxxxxxxx are
fix-snd-aoa-irq-conversion.patch
aoa-i2sbus-move-module-parameter-declaration-up.patch
aoa-i2sbus-fix-for-powermac72-and-73.patch
aoa-fix-when-all-is-built-into-the-kernel.patch
aoa-i2sbus-revamp-control-layer.patch
aoa-pmf-gpio-report-if-function-calling-fails.patch
aoa-fabric-layout-clean-up-messages.patch
aoa-tas-change-pcm1-name-to-pcm.patch
aoa-tas-fix-initialisation-reset.patch
aoa-tas-surface-drc-control-again.patch
aoa-layout-fabric-add-missing-module-aliases.patch
aoa-tas-add-missing-bass-treble-controls.patch
git-powerpc.patch
apple-motion-sensor-driver.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
