Commit 533d7647 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/hda-bus-ops-cleanup' into for-next 



Pull yet another compile error fix in the previous HD-audio patchset.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents cc911c22 40073a9d

sound/soc/sof/intel/hda-bus.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "hda.h"



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)

#include "../../codecs/hdac_hda.h"

#define sof_hda_ext_ops	snd_soc_hdac_hda_get_ops()

#else

#define sof_hda_ext_ops	NULL

sound/soc/sof/intel/hda.c

+0 −3
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ 
#include <sound/sof/xtensa.h>

#include "../ops.h"

#include "hda.h"

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)

#include "../../codecs/hdac_hda.h"

#endif



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

#include <sound/soc-acpi-intel-match.h>