commit ee267fe21a53038fcd4846b01af8ef59b4e19cbd
author Linux Build Service Account <lnxbuild@localhost> Tue Apr 03 06:01:38 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Tue Apr 03 06:01:39 2012 -0700
tree ee943bd1323c63928c2dcdb2e11a239e55548189
parent 44a64137d9828be31697fc824ee829217567ef53
parent 17283136aa8311e872aaf9453cd8b40449bf188c

Merge "Asoc: msm: Configure sampling rate to 48KHz for quad-mic topology" into msm-3.0

sound/soc/msm/qdsp6/q6adm.c

diff --git a/sound/soc/msm/qdsp6/q6adm.c b/sound/soc/msm/qdsp6/q6adm.c
index a3e1c13..f928c00 100644
--- a/sound/soc/msm/qdsp6/q6adm.c
+++ b/sound/soc/msm/qdsp6/q6adm.c
@@ -328,9 +328,7 @@
 			if ((open.topology_id ==
 				VPM_TX_SM_ECNS_COPP_TOPOLOGY) ||
 			    (open.topology_id ==
-				VPM_TX_DM_FLUENCE_COPP_TOPOLOGY) ||
-			    (open.topology_id ==
-				VPM_TX_QMIC_FLUENCE_COPP_TOPOLOGY))
+				VPM_TX_DM_FLUENCE_COPP_TOPOLOGY))
 				rate = 16000;
 		}