diff options
| author | Mark Brown <broonie@kernel.org> | 2017-04-30 22:15:40 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-04-30 22:15:40 +0900 |
| commit | d872f04606eec35de3bc4e409e186d01dacdd3d6 (patch) | |
| tree | 9099b67aa534170bdf7033973a12f86ff771299a /include | |
| parent | 9dfc53942d04875c4b2fd1706f5abf93957e7106 (diff) | |
| parent | 991454e17070eaf5286a666d9e896fd6fb332c72 (diff) | |
| download | linux-stable-d872f04606eec35de3bc4e409e186d01dacdd3d6.tar.gz linux-stable-d872f04606eec35de3bc4e409e186d01dacdd3d6.tar.bz2 linux-stable-d872f04606eec35de3bc4e409e186d01dacdd3d6.zip | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'include')
| -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 cdfb55f7aede..ee838b0d5db8 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -812,7 +812,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 auxiliary:1; /* for auxiliary component of the card */ unsigned int suspended:1; /* is in suspend PM state */ struct list_head list; |