diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-17 00:50:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-17 00:50:44 +0100 |
| commit | e3c51ca8fa4a0f3f13ba9be80bee2708cd723934 (patch) | |
| tree | 2fb9e21dd07ef066be1ce7291312c65c967a7710 /include | |
| parent | b3a6006e1d106fddcfc121d0ccfa9b7faeeb8f3e (diff) | |
| parent | 0e4ff5c806263bf40ee5409ac283b776f0c11e41 (diff) | |
Merge remote-tracking branch 'asoc/topic/devm' into asoc-samsung
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index d22cb0a06feb..d44728ab2be0 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -369,6 +369,7 @@ int snd_soc_codec_set_pll(struct snd_soc_codec *codec, int pll_id, int source, int snd_soc_register_card(struct snd_soc_card *card); int snd_soc_unregister_card(struct snd_soc_card *card); +int devm_snd_soc_register_card(struct device *dev, struct snd_soc_card *card); int snd_soc_suspend(struct device *dev); int snd_soc_resume(struct device *dev); int snd_soc_poweroff(struct device *dev); @@ -386,6 +387,9 @@ void snd_soc_unregister_codec(struct device *dev); int snd_soc_register_component(struct device *dev, const struct snd_soc_component_driver *cmpnt_drv, struct snd_soc_dai_driver *dai_drv, int num_dai); +int devm_snd_soc_register_component(struct device *dev, + const struct snd_soc_component_driver *cmpnt_drv, + struct snd_soc_dai_driver *dai_drv, int num_dai); void snd_soc_unregister_component(struct device *dev); int snd_soc_codec_volatile_register(struct snd_soc_codec *codec, unsigned int reg); |