summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-06-11 21:04:04 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-06-11 21:04:04 +0100
commit0e09b67e5886bf549ab14ef73de35d64ac867e2b (patch)
treea0d347f99e5faf766888a040156a17fa296772db /include/sound
parentfa44c077eb2a17aa6913feceb493d13f45f3fa25 (diff)
parent291f3bbcacf278726911c713e14cedb71c486b16 (diff)
downloadblackbird-op-linux-0e09b67e5886bf549ab14ef73de35d64ac867e2b.tar.gz
blackbird-op-linux-0e09b67e5886bf549ab14ef73de35d64ac867e2b.zip
Merge branch 'dapm' into for-2.6.32
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc.h2
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 {
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;
OpenPOWER on IntegriCloud