diff options
| author | Mark Brown <broonie@linaro.org> | 2014-04-18 21:00:30 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-18 21:00:30 +0400 |
| commit | 3819bfa23786fd1e8571fbb143e1b0b8f0fead86 (patch) | |
| tree | 5620fc0d02dddd1e9f460d9875d5232c232c78b8 /include | |
| parent | b2e69054ea1a36f2c1ace15a55240937aa091cba (diff) | |
| parent | 8931bf6208776292b1b888dd8534229f63e2eaa2 (diff) | |
| download | linux-3819bfa23786fd1e8571fbb143e1b0b8f0fead86.tar.xz | |
Merge branch 'topic/devm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-omap
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); |