diff options
| author | Mark Brown <broonie@kernel.org> | 2017-08-10 17:56:10 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-08-10 17:56:10 +0200 |
| commit | 42d9653e85b386111e729317b9492bfdac1cafbc (patch) | |
| tree | 5352463be37f477adb0d980005c61ad09eb67016 /include/sound | |
| parent | ASoC: use snd_soc_rtdcom_add() and convert to consistent operation (diff) | |
| parent | ASoC: soc-core: remove duplicate mutex_unlock from snd_soc_unregister_compone... (diff) | |
| download | linux-42d9653e85b386111e729317b9492bfdac1cafbc.tar.xz linux-42d9653e85b386111e729317b9492bfdac1cafbc.zip | |
Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 82e078151787..538e9880e010 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -469,10 +469,10 @@ int snd_soc_register_codec(struct device *dev, struct snd_soc_dai_driver *dai_drv, int num_dai); void snd_soc_unregister_codec(struct device *dev); int snd_soc_register_component(struct device *dev, - const struct snd_soc_component_driver *cmpnt_drv, + const struct snd_soc_component_driver *component_driver, 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, + const struct snd_soc_component_driver *component_driver, struct snd_soc_dai_driver *dai_drv, int num_dai); void snd_soc_unregister_component(struct device *dev); int snd_soc_cache_init(struct snd_soc_codec *codec); |