diff options
| author |   Mark Brown <broonie@kernel.org> | 2017-04-30 22:15:41 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-04-30 22:15:41 +0900 |
| commit | 0c2964cb38ef9dc44c11db7516bab00c1967e52e (patch) | |
| tree | 242e884d5858f9d9f727c01455068f38293b6252 /include | |
| parent | Merge remote-tracking branch 'asoc/topic/core' into asoc-next (diff) | |
| parent | ASoC: Intel: Skylake: Return negative error code (diff) | |
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index ee838b0d5db8..786765fc630b 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -497,7 +497,15 @@ void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream); int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, unsigned int dai_fmt); +#ifdef CONFIG_DMI int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour); +#else +static inline int snd_soc_set_dmi_name(struct snd_soc_card *card, + const char *flavour) +{ + return 0; +} +#endif /* Utility functions to get clock rates from various things */ int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots); |