[alsa-devel] [PATCH] wm8750: it's MONO1, not MONO

Dmitry Baryshkov dbaryshkov at gmail.com
Sat Aug 9 12:58:20 CEST 2008


Since first commit wm8750 contained output named MONO, but
all routes mentioned MONO1. Correct MONO to be MONO1.

Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Cc: Mark Brown <broonie at opensource.wolfsonmicro.com>
---
 sound/arm/pxa2xx-ac97-lib.c |    9 ++++-----
 sound/soc/codecs/wm8750.c   |    2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
index be500d3..3802d68 100644
--- a/sound/arm/pxa2xx-ac97-lib.c
+++ b/sound/arm/pxa2xx-ac97-lib.c
@@ -8,11 +8,10 @@
 #include <sound/pxa2xx-lib.h>
 
 #include <asm/irq.h>
-#include <asm/hardware.h>
-
-#include <asm/arch/pxa-regs.h>
-#include <asm/arch/pxa2xx-gpio.h>
-#include <asm/arch/audio.h>
+#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-gpio.h>
+#include <mach/audio.h>
 
 static DEFINE_MUTEX(car_mutex);
 static DECLARE_WAIT_QUEUE_HEAD(gsr_wq);
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index e23cb09..2e71394 100644
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -348,7 +348,7 @@ static const struct snd_soc_dapm_widget wm8750_dapm_widgets[] = {
 	SND_SOC_DAPM_OUTPUT("ROUT1"),
 	SND_SOC_DAPM_OUTPUT("LOUT2"),
 	SND_SOC_DAPM_OUTPUT("ROUT2"),
-	SND_SOC_DAPM_OUTPUT("MONO"),
+	SND_SOC_DAPM_OUTPUT("MONO1"),
 	SND_SOC_DAPM_OUTPUT("OUT3"),
 
 	SND_SOC_DAPM_INPUT("LINPUT1"),
-- 
1.5.6.3



More information about the Alsa-devel mailing list