---

yaml --- r: 206518 b: refs/heads/master c: ea762b0 h: refs/heads/master v: v3
git-mirror · May 31, 2010 · 9fe75fb · 9fe75fb
1 parent 03a115e
commit 9fe75fb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a642915ada4b7df9440a7bbed35cea94a5ccfe0
+refs/heads/master: ea762b047e13ba1cba4d58323b5c00a566610198
diff --git a/trunk/include/sound/soc-dapm.h b/trunk/include/sound/soc-dapm.h
@@ -273,6 +273,8 @@
 #define SND_SOC_DAPM_POST_PMD	0x8		/* after widget power down */
 #define SND_SOC_DAPM_PRE_REG	0x10	/* before audio path setup */
 #define SND_SOC_DAPM_POST_REG	0x20	/* after audio path setup */
+#define SND_SOC_DAPM_PRE_POST_PMD \
+				(SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD)
 
 /* convenience event type detection */
 #define SND_SOC_DAPM_EVENT_ON(e)	\