summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 15:51:52 +0100
committerMark Brown <broonie@kernel.org>2015-08-30 15:51:52 +0100
commit24ecc23cf62a48ae47ccc40f0f226d45c962512e (patch)
tree91d4f94ae19c126854baecfa893f4ab17530b39a /include/sound
parenta1780653b906ca342f20812570e1f07edb35b907 (diff)
parentabd31b32dde4683df6fd0439caa314aafd751698 (diff)
downloadlinux-24ecc23cf62a48ae47ccc40f0f226d45c962512e.tar.gz
linux-24ecc23cf62a48ae47ccc40f0f226d45c962512e.tar.bz2
linux-24ecc23cf62a48ae47ccc40f0f226d45c962512e.zip
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 93df8bf9d54a..59635a12c3be 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -758,7 +758,6 @@ struct snd_soc_component {
unsigned int ignore_pmdown_time:1; /* pmdown_time is ignored at stop */
unsigned int registered_as_component:1;
- unsigned int probed:1;
struct list_head list;