diff options
| author | Mark Brown <broonie@kernel.org> | 2015-08-30 10:51:52 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-30 10:51:52 -0400 |
| commit | 24ecc23cf62a48ae47ccc40f0f226d45c962512e (patch) | |
| tree | 91d4f94ae19c126854baecfa893f4ab17530b39a /include/sound | |
| parent | a1780653b906ca342f20812570e1f07edb35b907 (diff) | |
| parent | abd31b32dde4683df6fd0439caa314aafd751698 (diff) | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 1 |
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 { | |||
| 758 | 758 | ||
| 759 | unsigned int ignore_pmdown_time:1; /* pmdown_time is ignored at stop */ | 759 | unsigned int ignore_pmdown_time:1; /* pmdown_time is ignored at stop */ |
| 760 | unsigned int registered_as_component:1; | 760 | unsigned int registered_as_component:1; |
| 761 | unsigned int probed:1; | ||
| 762 | 761 | ||
| 763 | struct list_head list; | 762 | struct list_head list; |
| 764 | 763 | ||