From 35f5e54db923477f71d948f30c291d31bc0de0fc Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sat, 27 Sep 2008 10:45:09 +0100 Subject: ALSA: ASoC: Use snd_soc_dapm_nc_pin() in Zaurus machine drivers Signed-off-by: Mark Brown Signed-off-by: Takashi Iwai --- sound/soc/pxa/tosa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sound/soc/pxa/tosa.c') diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index 2baaa750f123..eae2a0fb45d4 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c @@ -190,8 +190,8 @@ static int tosa_ac97_init(struct snd_soc_codec *codec) { int i, err; - snd_soc_dapm_disable_pin(codec, "OUT3"); - snd_soc_dapm_disable_pin(codec, "MONOOUT"); + snd_soc_dapm_nc_pin(codec, "OUT3"); + snd_soc_dapm_nc_pin(codec, "MONOOUT"); /* add tosa specific controls */ for (i = 0; i < ARRAY_SIZE(tosa_controls); i++) { -- cgit v1.2.3 From d331124dc2923ec0966a82e3428c532cee8da95f Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Sun, 12 Oct 2008 13:17:36 +0100 Subject: ALSA: ASoC: update email address for Liam Girdwood Update the contact information for Liam Girdwood in ASoC core and drivers as my old email address is no longer valid. Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai --- sound/soc/pxa/tosa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sound/soc/pxa/tosa.c') diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index eae2a0fb45d4..afefe41b8c46 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c @@ -4,7 +4,7 @@ * Copyright 2005 Wolfson Microelectronics PLC. * Copyright 2005 Openedhand Ltd. * - * Authors: Liam Girdwood + * Authors: Liam Girdwood * Richard Purdie * * This program is free software; you can redistribute it and/or modify it -- cgit v1.2.3