From: Mark Brown <broonie@kernel.org>
Date: Thu, 21 Oct 2021 13:41:32 +0000 (+0100)
Subject: Merge branch 'asoc-5.15' into asoc-5.16
X-Git-Tag: v6.6.17~8344^2~59^2~80
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=324081ab79b7b45e9534304a99a753db005aa11d;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'asoc-5.15' into asoc-5.16
---

324081ab79b7b45e9534304a99a753db005aa11d
diff --cc sound/soc/rockchip/Makefile
index b10f5e7b136d,05b078e7b87f..30c57c0d7660
--- a/sound/soc/rockchip/Makefile
+++ b/sound/soc/rockchip/Makefile
@@@ -1,15 -1,12 +1,14 @@@
  # SPDX-License-Identifier: GPL-2.0
  # ROCKCHIP Platform Support
  snd-soc-rockchip-i2s-objs := rockchip_i2s.o
 +snd-soc-rockchip-i2s-tdm-objs := rockchip_i2s_tdm.o
- snd-soc-rockchip-pcm-objs := rockchip_pcm.o
  snd-soc-rockchip-pdm-objs := rockchip_pdm.o
  snd-soc-rockchip-spdif-objs := rockchip_spdif.o
  
- obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-rockchip-i2s.o snd-soc-rockchip-pcm.o
- obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S_TDM) += snd-soc-rockchip-i2s-tdm.o
+ obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-rockchip-i2s.o
  obj-$(CONFIG_SND_SOC_ROCKCHIP_PDM) += snd-soc-rockchip-pdm.o
  obj-$(CONFIG_SND_SOC_ROCKCHIP_SPDIF) += snd-soc-rockchip-spdif.o
++obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S_TDM) += snd-soc-rockchip-i2s-tdm.o
  
  snd-soc-rockchip-max98090-objs := rockchip_max98090.o
  snd-soc-rockchip-rt5645-objs := rockchip_rt5645.o