Applied "ASoC: rockchip: namespace rockchip i2s module name" to the asoc tree

Message ID E1ZjPuu-0005HK-U8@finisterre
State New
Headers show

Commit Message

Mark Brown Oct. 6, 2015, 10:56 a.m.
The patch

   ASoC: rockchip: namespace rockchip i2s module name

has been applied to the asoc tree at


All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.


From 698d0b59f3d91cc44a76dd2994a002d263c3606b Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <>

Date: Mon, 5 Oct 2015 21:03:39 +0200
Subject: [PATCH] ASoC: rockchip: namespace rockchip i2s module name

Change the rockchip i2s object name (and thus module name) from the
rather generic snd-soc-i2s to the more specific snd-soc-rockchip-i2s

Signed-off-by: Sjoerd Simons <>

Signed-off-by: Mark Brown <>

 sound/soc/rockchip/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Alsa-devel mailing list


diff --git a/sound/soc/rockchip/Makefile b/sound/soc/rockchip/Makefile
index 1bc1dc3..e9ba558 100644
--- a/sound/soc/rockchip/Makefile
+++ b/sound/soc/rockchip/Makefile
@@ -1,7 +1,7 @@ 
 # ROCKCHIP Platform Support
-snd-soc-i2s-objs := rockchip_i2s.o
+snd-soc-rockchip-i2s-objs := rockchip_i2s.o
-obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-i2s.o
+obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-rockchip-i2s.o
 snd-soc-rockchip-max98090-objs := rockchip_max98090.o
 snd-soc-rockchip-rt5645-objs := rockchip_rt5645.o