diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-06-11 16:04:04 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-06-11 16:04:04 -0400 |
| commit | 0e09b67e5886bf549ab14ef73de35d64ac867e2b (patch) | |
| tree | a0d347f99e5faf766888a040156a17fa296772db /include/sound | |
| parent | fa44c077eb2a17aa6913feceb493d13f45f3fa25 (diff) | |
| parent | 291f3bbcacf278726911c713e14cedb71c486b16 (diff) | |
Merge branch 'dapm' into for-2.6.32
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index a167b4930447..5297ba7e2c41 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
| @@ -369,8 +369,6 @@ struct snd_soc_codec { | |||
| 369 | enum snd_soc_bias_level bias_level; | 369 | enum snd_soc_bias_level bias_level; |
| 370 | enum snd_soc_bias_level suspend_bias_level; | 370 | enum snd_soc_bias_level suspend_bias_level; |
| 371 | struct delayed_work delayed_work; | 371 | struct delayed_work delayed_work; |
| 372 | struct list_head up_list; | ||
| 373 | struct list_head down_list; | ||
| 374 | 372 | ||
| 375 | /* codec DAI's */ | 373 | /* codec DAI's */ |
| 376 | struct snd_soc_dai *dai; | 374 | struct snd_soc_dai *dai; |