commit 787b92a13cd583250324636f577fefd8240d4993
author The Android Automerger <android-build@google.com> Tue Jul 30 11:10:15 2013 -0700
committer The Android Automerger <android-build@google.com> Tue Jul 30 11:10:15 2013 -0700
tree 1eabdaa1cb6cbec68ac7466f9d2abc1ffe8165dc
parent 0fecf5d5777a0fc8754f1f275d052bd9bd80ec81
parent 72cd4efa0628af6f6f0941a901a5715ec8ce0802

merge in klp-release history after reset to master

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index da16861..1cb668e 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -156,7 +156,7 @@
     [SND_DEVICE_OUT_HDMI] = 18,
     [SND_DEVICE_OUT_SPEAKER_AND_HDMI] = 15,
     [SND_DEVICE_OUT_BT_SCO] = 22,
-    [SND_DEVICE_OUT_VOICE_HANDSET_TMUS] = 81,
+    [SND_DEVICE_OUT_VOICE_HANDSET_TMUS] = 88,
     [SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES] = 17,
     [SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES] = 17,
     [SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET] = 37,
@@ -174,7 +174,7 @@
     [SND_DEVICE_IN_CAMCORDER_MIC] = 61,
     [SND_DEVICE_IN_VOICE_DMIC_EF] = 41,
     [SND_DEVICE_IN_VOICE_DMIC_BS] = 5,
-    [SND_DEVICE_IN_VOICE_DMIC_EF_TMUS] = 91,
+    [SND_DEVICE_IN_VOICE_DMIC_EF_TMUS] = 89,
     [SND_DEVICE_IN_VOICE_SPEAKER_DMIC_EF] = 43,
     [SND_DEVICE_IN_VOICE_SPEAKER_DMIC_BS] = 12,
     [SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC] = 16,