summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-04 20:57:04 +0000
committerMark Brown <broonie@kernel.org>2015-02-04 20:57:04 +0000
commitd01aa9b704afa8875c2ae919cfd639660b2a26bc (patch)
tree28d84e4d55b28d88f12319148ff5e85e568415b1 /include/sound
parentde784bed8fe3d73bcab938e0f7d6525ae646057a (diff)
parentd29697dc3b92cb12a80632a5ade4fa26fd98225e (diff)
downloadblackbird-obmc-linux-d01aa9b704afa8875c2ae919cfd639660b2a26bc.tar.gz
blackbird-obmc-linux-d01aa9b704afa8875c2ae919cfd639660b2a26bc.zip
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc-dapm.h2
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);
OpenPOWER on IntegriCloud