diff options
author | YueHaibing <yuehaibing@huawei.com> | 2019-08-09 07:01:00 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-08-09 08:24:20 -0400 |
commit | a62bd63893027bfa32fccbba0e0ac067824c362c (patch) | |
tree | 976e1175b5495c7388d67e81c3754811c6d3f895 | |
parent | 4604da661ff175e4e3a2284f38d978aba9cc04fd (diff) |
ASoC: SOF: Intel: Add missing include file hdac_hda.h
Building with SND_SOC_SOF_HDA_AUDIO_CODEC fails:
sound/soc/sof/intel/hda-bus.c: In function sof_hda_bus_init:
sound/soc/sof/intel/hda-bus.c:16:25: error: implicit declaration of function
snd_soc_hdac_hda_get_ops; did you mean snd_soc_jack_add_gpiods? [-Werror=implicit-function-declaration]
#define sof_hda_ext_ops snd_soc_hdac_hda_get_ops()
Reported-by: Hulk Robot <hulkci@huawei.com>
Suggested-by: Takashi Iwai <tiwai@suse.de>
Fixes: d4ff1b3917a5 ('ASoC: SOF: Intel: Initialize hdaudio bus properly")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Link: https://lore.kernel.org/r/20190809110100.71236-1-yuehaibing@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/sof/intel/hda-bus.c | 1 | ||||
-rw-r--r-- | sound/soc/sof/intel/hda.c | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/sof/intel/hda-bus.c b/sound/soc/sof/intel/hda-bus.c index 0caec3a070d3..1d2babdda9dd 100644 --- a/sound/soc/sof/intel/hda-bus.c +++ b/sound/soc/sof/intel/hda-bus.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include "hda.h" | 13 | #include "hda.h" |
14 | 14 | ||
15 | #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) | 15 | #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) |
16 | #include "../../codecs/hdac_hda.h" | ||
16 | #define sof_hda_ext_ops snd_soc_hdac_hda_get_ops() | 17 | #define sof_hda_ext_ops snd_soc_hdac_hda_get_ops() |
17 | #else | 18 | #else |
18 | #define sof_hda_ext_ops NULL | 19 | #define sof_hda_ext_ops NULL |
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index d04844d6b104..28eb780494aa 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c | |||
@@ -23,9 +23,6 @@ | |||
23 | #include <sound/sof/xtensa.h> | 23 | #include <sound/sof/xtensa.h> |
24 | #include "../ops.h" | 24 | #include "../ops.h" |
25 | #include "hda.h" | 25 | #include "hda.h" |
26 | #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) | ||
27 | #include "../../codecs/hdac_hda.h" | ||
28 | #endif | ||
29 | 26 | ||
30 | #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) | 27 | #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) |
31 | #include <sound/soc-acpi-intel-match.h> | 28 | #include <sound/soc-acpi-intel-match.h> |