![Shawn Guo](/assets/img/avatar_default.png)
Freescale PowerPC and ARM/IMX families share the same SSI IP block. The patch merges sound/soc/imx into sound/soc/fsl, so that the possible code sharing and consolidation can happen. This is a plain merge, except that menuconfig SND_POWERPC_SOC is added in Kconfig for PowerPC platform as a correspondence to SND_IMX_SOC for IMX platform. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Timur Tabi <timur@freescale.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
27 lines
885 B
Makefile
27 lines
885 B
Makefile
snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o
|
|
snd-soc-core-objs += soc-pcm.o soc-io.o
|
|
|
|
snd-soc-dmaengine-pcm-objs := soc-dmaengine-pcm.o
|
|
obj-$(CONFIG_SND_SOC_DMAENGINE_PCM) += snd-soc-dmaengine-pcm.o
|
|
|
|
obj-$(CONFIG_SND_SOC) += snd-soc-core.o
|
|
obj-$(CONFIG_SND_SOC) += codecs/
|
|
obj-$(CONFIG_SND_SOC) += atmel/
|
|
obj-$(CONFIG_SND_SOC) += au1x/
|
|
obj-$(CONFIG_SND_SOC) += blackfin/
|
|
obj-$(CONFIG_SND_SOC) += davinci/
|
|
obj-$(CONFIG_SND_SOC) += ep93xx/
|
|
obj-$(CONFIG_SND_SOC) += fsl/
|
|
obj-$(CONFIG_SND_SOC) += jz4740/
|
|
obj-$(CONFIG_SND_SOC) += mid-x86/
|
|
obj-$(CONFIG_SND_SOC) += mxs/
|
|
obj-$(CONFIG_SND_SOC) += nuc900/
|
|
obj-$(CONFIG_SND_SOC) += omap/
|
|
obj-$(CONFIG_SND_SOC) += kirkwood/
|
|
obj-$(CONFIG_SND_SOC) += pxa/
|
|
obj-$(CONFIG_SND_SOC) += samsung/
|
|
obj-$(CONFIG_SND_SOC) += s6000/
|
|
obj-$(CONFIG_SND_SOC) += sh/
|
|
obj-$(CONFIG_SND_SOC) += tegra/
|
|
obj-$(CONFIG_SND_SOC) += txx9/
|