Skip to content

Commit

Permalink
ASoC: Intel: bxt_pcm512x: fix compilation issues
Browse files Browse the repository at this point in the history
Kbuild report errors when modules are enabled. Move structure
definitions and use IS_ENABLED.

Fixes: 7ce1ad6 ('ASoC: Intel: bxt_pcm512x: make HDMI optional')
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
  • Loading branch information
plbossart committed Nov 12, 2018
1 parent 9b81e16 commit 165b34d
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions sound/soc/intel/boards/bxt_pcm512x.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@
#include "../../codecs/pcm512x.h"
#include "../atom/sst-atom-controls.h"

#ifdef CONFIG_SND_SOC_HDAC_HDMI
struct bxt_card_private {
struct list_head hdmi_pcm_list;
};

#if IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
static struct snd_soc_jack broxton_hdmi[3];

struct bxt_hdmi_pcm {
Expand Down Expand Up @@ -99,10 +103,6 @@ static int bxt_card_late_probe(struct snd_soc_card *card)
}
#endif

struct bxt_card_private {
struct list_head hdmi_pcm_list;
};

static const struct snd_soc_dapm_widget dapm_widgets[] = {
SND_SOC_DAPM_SPK("Ext Spk", NULL),
};
Expand Down Expand Up @@ -192,7 +192,7 @@ static struct snd_soc_dai_link dailink[] = {
.dpcm_playback = 1,
.dpcm_capture = 1,
},
#ifdef CONFIG_SND_SOC_HDAC_HDMI
#if IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
{
.name = "iDisp1",
.id = 1,
Expand Down

0 comments on commit 165b34d

Please sign in to comment.