diff --git a/[refs] b/[refs]
index e20ba1542c49..1418e428fe8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5674ad6ca9f1020c2bcc009a55becba3c30d8a3
+refs/heads/master: 4afdea81821880d0fc35e6c7ff54eeed9ec0614d
diff --git a/trunk/arch/mips/jz4740/platform.c b/trunk/arch/mips/jz4740/platform.c
index 95bc2b5b14f1..1cc9e544d16b 100644
--- a/trunk/arch/mips/jz4740/platform.c
+++ b/trunk/arch/mips/jz4740/platform.c
@@ -208,7 +208,7 @@ struct platform_device jz4740_i2s_device = {
 
 /* PCM */
 struct platform_device jz4740_pcm_device = {
-	.name		= "jz4740-pcm",
+	.name		= "jz4740-pcm-audio",
 	.id		= -1,
 };