diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-05-09 08:13:40 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-05-09 08:13:40 +0300 |
| commit | ed97c988bdc61ab6fb5d1f5f02a709844557b68f (patch) | |
| tree | 9eb2087f95a6e319c44cf7f4f1bcd9ab723651d1 /sound/soc/sof | |
| parent | 7f84ff68be05ec7a5d2acf8fdc734fe5897af48f (diff) | |
| parent | 7f6647ced298d56027218e47619b7f0d925fc83e (diff) | |
| download | linux-ed97c988bdc61ab6fb5d1f5f02a709844557b68f.tar.xz | |
Merge tag 'asoc-v5.2-5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.2
A bunch of driver specific fixes that came in since the initial pull
request for v5.2, mainly warning fixes for the newly added Sound Open
Firmware code which people appeared to only start looking at after I'd
sent the pull request.
Diffstat (limited to 'sound/soc/sof')
| -rw-r--r-- | sound/soc/sof/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index 5ddbfa8f1a28..32105e0fabe8 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -259,8 +259,10 @@ int snd_sof_create_page_table(struct snd_sof_dev *sdev, static int sof_machine_check(struct snd_sof_dev *sdev) { struct snd_sof_pdata *plat_data = sdev->pdata; +#if IS_ENABLED(CONFIG_SND_SOC_SOF_NOCODEC) struct snd_soc_acpi_mach *machine; int ret; +#endif if (plat_data->machine) return 0; |