diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-09 15:10:00 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-09 15:10:00 +0800 |
| commit | afcfe4359e32f4fe1588b1d60414aacce676e27a (patch) | |
| tree | 246377b48e8cbe7f87087b5fb1f1276cc17d5e61 /include/sound | |
| parent | 0cee4db21e856d20aaa6624d0ff6a5f7d8aeea65 (diff) | |
| parent | 8f6f9b2982b2c924fe2dde816e2decb3ca1d8f8f (diff) | |
| download | linux-afcfe4359e32f4fe1588b1d60414aacce676e27a.tar.gz linux-afcfe4359e32f4fe1588b1d60414aacce676e27a.tar.bz2 linux-afcfe4359e32f4fe1588b1d60414aacce676e27a.zip | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dapm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index ecffeccb5534..a2a0cf6e74fd 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -405,7 +405,7 @@ int snd_soc_dapm_mux_update_power(struct snd_soc_dapm_context *dapm, struct snd_soc_dapm_update *update); /* dapm sys fs - used by the core */ -int snd_soc_dapm_sys_add(struct device *dev); +extern struct attribute *soc_dapm_dev_attrs[]; void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm, struct dentry *parent); |