From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pierre-Louis Bossart Subject: [PATCH 01/19] ASoC: Intel: fix ACPI probe regression with Atom DPCM driver Date: Thu, 17 Dec 2015 20:35:38 -0600 Message-ID: <1450406156-22246-2-git-send-email-pierre-louis.bossart@linux.intel.com> References: <1450406156-22246-1-git-send-email-pierre-louis.bossart@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by alsa0.perex.cz (Postfix) with ESMTP id 45560261543 for ; Fri, 18 Dec 2015 03:37:06 +0100 (CET) In-Reply-To: <1450406156-22246-1-git-send-email-pierre-louis.bossart@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: alsa-devel@alsa-project.org Cc: bardliao@realtek.com, broonie@kernel.org, Pierre-Louis Bossart , jack.yu@realtek.com List-Id: alsa-devel@alsa-project.org Commit 5f3d57ebdda4de30e00e2d7c45b5247e5410fe6b 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 --- 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