aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-04-18 13:02:49 -0400
committerMark Brown <broonie@linaro.org>2014-04-18 13:02:49 -0400
commitab052d465bf7d52c1db176b762a91448e16d62c3 (patch)
treef586b28e117d57bfcdfa0bca53f9417b17b70ec4 /include
parent40448e5e977b59a4753fce3619f537b63fcedc02 (diff)
parentfe7b5868809a89a7316eef064f0bb7796aa8c225 (diff)
Merge commit 'topic/omap' into asoc-davinci
Diffstat (limited to 'include')
-rw-r--r--include/sound/soc.h2
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);
377int snd_soc_poweroff(struct device *dev); 377int snd_soc_poweroff(struct device *dev);
378int snd_soc_register_platform(struct device *dev, 378int snd_soc_register_platform(struct device *dev,
379 const struct snd_soc_platform_driver *platform_drv); 379 const struct snd_soc_platform_driver *platform_drv);
380int devm_snd_soc_register_platform(struct device *dev,
381 const struct snd_soc_platform_driver *platform_drv);
380void snd_soc_unregister_platform(struct device *dev); 382void snd_soc_unregister_platform(struct device *dev);
381int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform, 383int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform,
382 const struct snd_soc_platform_driver *platform_drv); 384 const struct snd_soc_platform_driver *platform_drv);