Merge branch 'dapm' into for-2.6.32

0e09b67e · Mark Brown · fa44c077 · 291f3bbc · 0e09b67e · 0e09b67e
Commit 0e09b67e authored Jun 11, 2009 by Mark Brown
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 227 additions and 77 deletions

include/sound/soc.h include/sound/soc.h +0 -2

sound/soc/soc-dapm.c sound/soc/soc-dapm.c +227 -75

No files found.
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -369,8 +369,6 @@ struct snd_soc_codec {
 	enum snd_soc_bias_level bias_level;
 	enum snd_soc_bias_level suspend_bias_level;
 	struct delayed_work delayed_work;
-	struct list_head up_list;
-	struct list_head down_list;
 	/* codec DAI's */
 	struct snd_soc_dai *dai;

--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c