commit adf61deefa6127e3d067f0d32c6b692385eaf370
author Linux Build Service Account <lnxbuild@localhost> Tue May 06 13:45:15 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue May 06 13:45:15 2014 -0700
tree d864599403884345baa839e8f9cefbd98ee205c4
parent 16267087f3529cc7d30081cfb6826ff51d70430b
parent 01037cb7f3af164752b96c84b4e5554ce51c8613

Merge "msm8974: Changes in mixer sequence"

mixer_paths.xml

diff --git a/mixer_paths.xml b/mixer_paths.xml
index f4e6b27..e8c918b 100644
--- a/mixer_paths.xml
+++ b/mixer_paths.xml
@@ -960,12 +960,12 @@
     </path>
 
     <path name="voice-headphones">
-        <path name="sidetone-headphones" />
         <path name="headphones" />
     </path>
 
     <path name="voice-headset-mic">
         <path name="headset-mic" />
+        <path name="sidetone-headphones" />
         <ctl name="ADC2 Volume" value="13" />
     </path>
 

mixer_paths_auxpcm.xml

diff --git a/mixer_paths_auxpcm.xml b/mixer_paths_auxpcm.xml
index 5a0a860..7c29c82 100644
--- a/mixer_paths_auxpcm.xml
+++ b/mixer_paths_auxpcm.xml
@@ -587,12 +587,12 @@
     </path>
 
     <path name="voice-headphones">
-        <path name="sidetone-headphones" />
         <path name="headphones" />
     </path>
 
     <path name="voice-headset-mic">
         <path name="headset-mic" />
+        <path name="sidetone-headphones" />
         <ctl name="ADC2 Volume" value="13" />
     </path>