diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-08-21 19:26:48 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-08-21 19:26:48 +0200 |
| commit | 00833d70ca29a9d60c694b9475a9d3327ed9461e (patch) | |
| tree | 48ae16d7d4c1ca370ff223279b49602c6d3f44a9 /include/sound | |
| parent | fa4f18b4f402d3654415935511d8e0bb51a102b7 (diff) | |
| parent | f6b28e4ded45bb91bc4cd115d55e35badedfce5f (diff) | |
| download | blackbird-op-linux-00833d70ca29a9d60c694b9475a9d3327ed9461e.tar.gz blackbird-op-linux-00833d70ca29a9d60c694b9475a9d3327ed9461e.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-topology.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/sound/soc-topology.h b/include/sound/soc-topology.h index 865a141b118b..427bc41df3ae 100644 --- a/include/sound/soc-topology.h +++ b/include/sound/soc-topology.h @@ -141,6 +141,8 @@ struct snd_soc_tplg_ops { int io_ops_count; }; +#ifdef CONFIG_SND_SOC_TOPOLOGY + /* gets a pointer to data from the firmware block header */ static inline const void *snd_soc_tplg_get_data(struct snd_soc_tplg_hdr *hdr) { @@ -165,4 +167,14 @@ int snd_soc_tplg_widget_bind_event(struct snd_soc_dapm_widget *w, const struct snd_soc_tplg_widget_events *events, int num_events, u16 event_type); +#else + +static inline int snd_soc_tplg_component_remove(struct snd_soc_component *comp, + u32 index) +{ + return 0; +} + +#endif + #endif |
