From 6b222dccb96baa42b58045ca34259f2b9f58a2d3 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sat, 10 Sep 2011 22:36:17 -0700 Subject: [PATCH] --- yaml --- r: 270575 b: refs/heads/master c: 32d2a0c17d81016215381d337dad876dc972ee83 h: refs/heads/master i: 270573: c0bd5c4dbd06914bb917cbea3dc564366930b6f7 270571: 191eea7e11fac287eba85012056a1705b0516520 270567: 3d9ed76a169fae9cf527938a9d2372a08aea2d95 270559: 10209336d828bff2c2bde004fce293892ba93d24 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8996.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d1db4070795c..967ad6b19a9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c83495af6395446b81da54b17a479557ad0b2fc8 +refs/heads/master: 32d2a0c17d81016215381d337dad876dc972ee83 diff --git a/trunk/sound/soc/codecs/wm8996.c b/trunk/sound/soc/codecs/wm8996.c index 9d0ab87bad96..7280a10d5fe7 100644 --- a/trunk/sound/soc/codecs/wm8996.c +++ b/trunk/sound/soc/codecs/wm8996.c @@ -1059,14 +1059,14 @@ SND_SOC_DAPM_DAC("DAC2R", NULL, WM8996_POWER_MANAGEMENT_5, 2, 0), SND_SOC_DAPM_DAC("DAC1L", NULL, WM8996_POWER_MANAGEMENT_5, 1, 0), SND_SOC_DAPM_DAC("DAC1R", NULL, WM8996_POWER_MANAGEMENT_5, 0, 0), -SND_SOC_DAPM_AIF_IN("AIF2RX1", "AIF2 Playback", 1, +SND_SOC_DAPM_AIF_IN("AIF2RX1", "AIF2 Playback", 0, WM8996_POWER_MANAGEMENT_4, 9, 0), -SND_SOC_DAPM_AIF_IN("AIF2RX0", "AIF2 Playback", 2, +SND_SOC_DAPM_AIF_IN("AIF2RX0", "AIF2 Playback", 1, WM8996_POWER_MANAGEMENT_4, 8, 0), -SND_SOC_DAPM_AIF_IN("AIF2TX1", "AIF2 Capture", 1, +SND_SOC_DAPM_AIF_IN("AIF2TX1", "AIF2 Capture", 0, WM8996_POWER_MANAGEMENT_6, 9, 0), -SND_SOC_DAPM_AIF_IN("AIF2TX0", "AIF2 Capture", 2, +SND_SOC_DAPM_AIF_IN("AIF2TX0", "AIF2 Capture", 1, WM8996_POWER_MANAGEMENT_6, 8, 0), SND_SOC_DAPM_AIF_IN("AIF1RX5", "AIF1 Playback", 5,