Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Vinod Koul <vinod.koul@intel.com>
To: alsa-devel@alsa-project.org
Cc: patches.audio@intel.com,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
	liam.r.girdwood@linux.intel.com,
	Vinod Koul <vinod.koul@intel.com>,
	broonie@kernel.org
Subject: [PATCH 1/4] ASoC: Intel: Revert "ASoC: Intel: fix ACPI probe regression with Atom DPCM driver"
Date: Mon,  8 Feb 2016 10:45:36 +0530	[thread overview]
Message-ID: <1454908539-14137-2-git-send-email-vinod.koul@intel.com> (raw)
In-Reply-To: <1454908539-14137-1-git-send-email-vinod.koul@intel.com>

This reverts commit dc901a354171 ("ASoC: Intel: fix ACPI probe
regression with Atom DPCM driver") as the fix prevented the probe
on HSW/BDW if Atom-DPCM was selected

Acked-by: Jie Yang <yang.jie@intel.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 sound/soc/intel/common/Makefile | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/sound/soc/intel/common/Makefile b/sound/soc/intel/common/Makefile
index 668fdeee195e..3b9332e7a094 100644
--- a/sound/soc/intel/common/Makefile
+++ b/sound/soc/intel/common/Makefile
@@ -1,10 +1,5 @@
 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

  reply	other threads:[~2016-02-08  5:12 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-08  5:15 [PATCH 0/4] ASoC: Intel: Really fix the BYT/HSW regressions Vinod Koul
2016-02-08  5:15 ` Vinod Koul [this message]
2016-02-08 18:01   ` Applied "ASoC: Intel: Revert "ASoC: Intel: fix ACPI probe regression with Atom DPCM driver"" to the asoc tree Mark Brown
2016-02-08  5:15 ` [PATCH 2/4] ASoC: Intel: Create independent acpi match module Vinod Koul
2016-02-08 18:01   ` Applied "ASoC: Intel: Create independent acpi match module" to the asoc tree Mark Brown
2016-02-08  5:15 ` [PATCH 3/4] ASoC: Intel: Load the atom DPCM driver only Vinod Koul
2016-02-08 18:01   ` Applied "ASoC: Intel: Load the atom DPCM driver only" to the asoc tree Mark Brown
2016-02-08  5:15 ` [PATCH 4/4] ASoC: Intel: Add module tags for common match module Vinod Koul
2016-02-08 18:01   ` Applied "ASoC: Intel: Add module tags for common match module" to the asoc tree Mark Brown

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=1454908539-14137-2-git-send-email-vinod.koul@intel.com \
    --to=vinod.koul@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=liam.r.girdwood@linux.intel.com \
    --cc=patches.audio@intel.com \
    --cc=pierre-louis.bossart@linux.intel.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox