Merge remote-tracking branches 'asoc/topic/rl6231' and 'asoc/topic/rt5514' into asoc...
authorMark Brown <broonie@kernel.org>
Fri, 10 Nov 2017 21:31:23 +0000 (21:31 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 10 Nov 2017 21:31:23 +0000 (21:31 +0000)
1  2  3 
sound/soc/codecs/Makefile

index 05018b7ca72bdd7219cd64ba91525df7fc1c6e2f,77c18189c9adb72244b91a5e657fb0393afc9117,2dc42b2969736bc7300ed45de3a4f7c75c7e8208..0001069ce2a7e2f346cd7775f144864282d622e8
@@@@ -1,4 -1,3 -1,3 +1,4 @@@@
 ++# SPDX-License-Identifier: GPL-2.0
   snd-soc-88pm860x-objs := 88pm860x-codec.o
   snd-soc-ab8500-codec-objs := ab8500-codec.o
   snd-soc-ac97-objs := ac97.o
@@@@ -360,6 -359,6 -359,7 +360,7 @@@@ obj-$(CONFIG_SND_SOC_RT286)       += snd-soc-
   obj-$(CONFIG_SND_SOC_RT298)  += snd-soc-rt298.o
   obj-$(CONFIG_SND_SOC_RT5514) += snd-soc-rt5514.o
   obj-$(CONFIG_SND_SOC_RT5514_SPI)     += snd-soc-rt5514-spi.o
++ obj-$(CONFIG_SND_SOC_RT5514_SPI_BUILTIN)     += snd-soc-rt5514-spi.o
   obj-$(CONFIG_SND_SOC_RT5616) += snd-soc-rt5616.o
   obj-$(CONFIG_SND_SOC_RT5631) += snd-soc-rt5631.o
   obj-$(CONFIG_SND_SOC_RT5640) += snd-soc-rt5640.o