diff options
| author |   Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:04 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:04 +0000 |
| commit | d01aa9b704afa8875c2ae919cfd639660b2a26bc (patch) | |
| tree | 28d84e4d55b28d88f12319148ff5e85e568415b1 /include/sound | |
| parent | Merge remote-tracking branches 'asoc/fix/ac97', 'asoc/fix/atmel', 'asoc/fix/intel', 'asoc/fix/rt286', 'asoc/fix/rt5640', 'asoc/fix/sgtl5000', 'asoc/fix/sta32x', 'asoc/fix/tlv320aic3x' and 'asoc/fix/wm8731' into asoc-linus (diff) | |
| parent | ASoC: Add sysfs entries via static attribute groups (diff) | |
| download | linux-dev-d01aa9b704afa8875c2ae919cfd639660b2a26bc.tar.xz linux-dev-d01aa9b704afa8875c2ae919cfd639660b2a26bc.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 89823cfe6f04..e8e0220404d4 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); |