OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a6955fe
)
ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver
author
Pierre-Louis Bossart
<pierre-louis.bossart@linux.intel.com>
Fri, 1 Nov 2019 17:30:37 +0000
(12:30 -0500)
committer
Mark Brown
<broonie@kernel.org>
Mon, 4 Nov 2019 13:23:39 +0000
(13:23 +0000)
This legacy driver is already deprecated, let's make sure there is no
conflict with SOF.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link:
https://lore.kernel.org/r/20191101173045.27099-4-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/Kconfig
patch
|
blob
|
history
diff --git
a/sound/soc/intel/Kconfig
b/sound/soc/intel/Kconfig
index
93ebe12
..
086fc60
100644
(file)
--- a/
sound/soc/intel/Kconfig
+++ b/
sound/soc/intel/Kconfig
@@
-65,7
+65,7
@@
config SND_SOC_INTEL_HASWELL
config SND_SOC_INTEL_BAYTRAIL
tristate "Baytrail (legacy) Platforms"
- depends on DMADEVICES && ACPI && SND_SST_ATOM_HIFI2_PLATFORM=n
+ depends on DMADEVICES && ACPI && SND_SST_ATOM_HIFI2_PLATFORM=n
&& SND_SOC_SOF_BAYTRAIL=n
select SND_SOC_INTEL_SST
select SND_SOC_INTEL_SST_ACPI
select SND_SOC_INTEL_SST_FIRMWARE