From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: broonie@kernel.org,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: [PATCH v2 1/8] ASoC: Intel: fix ACPI probe regression with Atom DPCM driver
Date: Mon, 4 Jan 2016 17:20:23 -0600 [thread overview]
Message-ID: <1451949630-3475-2-git-send-email-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <1451949630-3475-1-git-send-email-pierre-louis.bossart@linux.intel.com>
The commit 95f098014815b330838b1173d3d7bcea3b481242
"ASoC: Intel: Move apci find machine routines"
introduced a regression in ACPI probe of the DPCM driver.
Fix by conditionally compiling sst-acpi when the DPCM driver
is not selected
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/intel/common/Makefile | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/sound/soc/intel/common/Makefile b/sound/soc/intel/common/Makefile
index 3b9332e..668fdee 100644
--- a/sound/soc/intel/common/Makefile
+++ b/sound/soc/intel/common/Makefile
@@ -1,5 +1,10 @@
snd-soc-sst-dsp-objs := sst-dsp.o
+ifneq ($(CONFIG_SND_SST_IPC_ACPI),)
+snd-soc-sst-acpi-objs := sst-match-acpi.o
+else
snd-soc-sst-acpi-objs := sst-acpi.o sst-match-acpi.o
+endif
+
snd-soc-sst-ipc-objs := sst-ipc.o
snd-soc-sst-dsp-$(CONFIG_DW_DMAC_CORE) += sst-firmware.o
--
1.9.1
next prev parent reply other threads:[~2016-01-04 23:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-04 23:20 [PATCH v2 0/8] Baytrail followup Pierre-Louis Bossart
2016-01-04 23:20 ` Pierre-Louis Bossart [this message]
2016-01-04 23:20 ` [PATCH v2 2/8] ASoC: Intel: add bytct-rt5651 machine driver Pierre-Louis Bossart
2016-01-05 17:49 ` Applied "ASoC: Intel: add bytct-rt5651 machine driver" to the asoc tree Mark Brown
2016-01-04 23:20 ` [PATCH v2 3/8] ASoC: intel: boards: add card for MinnowBoard I2S access Pierre-Louis Bossart
2016-01-05 13:15 ` Mark Brown
2016-01-05 14:50 ` Pierre-Louis Bossart
2016-01-06 17:42 ` Mark Brown
2016-01-06 20:59 ` Pierre-Louis Bossart
2016-01-04 23:20 ` [PATCH v2 4/8] ASoC: rt5640: add ASRC support Pierre-Louis Bossart
2016-01-04 23:20 ` [PATCH v2 5/8] ASoC: Intel: bytcr-rt5640: enable ASRC Pierre-Louis Bossart
2016-01-04 23:20 ` [PATCH v2 6/8] ASoC: Intel: bytcr_rt5640: fixup DAI codec_name with HID Pierre-Louis Bossart
2016-01-04 23:20 ` [PATCH v2 7/8] ASoC: Intel: Atom: add support for RT5642 Pierre-Louis Bossart
2016-01-04 23:20 ` [PATCH v2 8/8] ASoC: Intel: Atom: Add support for HP ElitePad 1000 G2 Pierre-Louis Bossart
2016-01-05 12:43 ` [PATCH v2 0/8] Baytrail followup Mark Brown
2016-01-05 14:41 ` Pierre-Louis Bossart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1451949630-3475-2-git-send-email-pierre-louis.bossart@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.