diff options
| author |   Mark Brown <broonie@linaro.org> | 2014-04-18 18:02:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-18 18:02:49 +0100 |
| commit | ab052d465bf7d52c1db176b762a91448e16d62c3 (patch) | |
| tree | f586b28e117d57bfcdfa0bca53f9417b17b70ec4 /include | |
| parent | ASoC: davinci-mcasp: Do not touch 0x04 register above McASP_VERSION_2 (diff) | |
| parent | ASoC: omap-pcm: Support for binding the platform driver to dai devices (diff) | |
Merge commit 'topic/omap' into asoc-davinci
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 0b83168d8ff4..34c34d6e095c 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -377,6 +377,8 @@ int snd_soc_resume(struct device *dev); int snd_soc_poweroff(struct device *dev); int snd_soc_register_platform(struct device *dev, const struct snd_soc_platform_driver *platform_drv); +int devm_snd_soc_register_platform(struct device *dev, + const struct snd_soc_platform_driver *platform_drv); void snd_soc_unregister_platform(struct device *dev); int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform, const struct snd_soc_platform_driver *platform_drv); |