Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ASoC: Intel: bxt_pcm512x: fix compilation issues #269

Merged
merged 1 commit into from
Nov 12, 2018
Merged

ASoC: Intel: bxt_pcm512x: fix compilation issues #269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions sound/soc/intel/boards/bxt_pcm512x.c
View file
Open in desktop
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