Merge branch 'dapm' into for-2.6.32

2009-06-11 21:04:04 +01:00
parent fa44c077eb 291f3bbcac
commit 0e09b67e58
2 changed files with 230 additions and 80 deletions
--- 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;