diff options
| author | Pierre-Louis Bossart | 2017-10-13 01:49:38 +0200 |
|---|---|---|
| committer | Mark Brown | 2017-10-21 12:21:09 +0200 |
| commit | 7feb2f786a46d34cac760d5e246dfbdafafa0e96 (patch) | |
| tree | 7d831a7cc496461853d29b0b7a1e5b5130dc276c /sound/soc/Makefile | |
| parent | SoC: intel: byt: Introduce new custom IN2 map (diff) | |
| download | kernel-qcow2-linux-7feb2f786a46d34cac760d5e246dfbdafafa0e96.tar.gz kernel-qcow2-linux-7feb2f786a46d34cac760d5e246dfbdafafa0e96.tar.xz kernel-qcow2-linux-7feb2f786a46d34cac760d5e246dfbdafafa0e96.zip | |
ASoC: move ACPI common code out of Intel/sst tree
ACPI support is not specific to the Intel/SST driver. Move the enumeration
and matching code which is not hardware-dependent to sound/soc and rename
relevant sst_acpi_ structures and functions with snd_soc_acpi_ prefix
soc-acpi.h is protected by a #ifndef __LINUX_SND_SOC_ACPI_H for
consistency with all other SoC .h files:
grep -L __LINUX include/sound/soc* | wc -l
0
grep __LINUX include/sound/soc* | wc -l
14
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/Makefile')
| -rw-r--r-- | sound/soc/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/Makefile b/sound/soc/Makefile index 39c27a58158d..95f2a73f9aed 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -14,6 +14,12 @@ ifneq ($(CONFIG_SND_SOC_AC97_BUS),) snd-soc-core-objs += soc-ac97.o endif +ifneq ($(CONFIG_SND_SOC_ACPI),) +snd-soc-acpi-objs := soc-acpi.o +endif + +obj-$(CONFIG_SND_SOC_ACPI) += snd-soc-acpi.o + obj-$(CONFIG_SND_SOC) += snd-soc-core.o obj-$(CONFIG_SND_SOC) += codecs/ obj-$(CONFIG_SND_SOC) += generic/ |