commit cf3383fbb03a0aae622b0dbcd10c6975332da68a
author Mark Brown <broonie@opensource.wolfsonmicro.com> Tue Jun 07 09:49:47 2011 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> Tue Jun 07 09:49:47 2011 +0100
tree 9903268220798ce79727fcd32a97b11f057bd67e
parent 0c8e2917f2f56e9836692e1d5a12f04af00b1a5a
parent 064d58ee3afb8a865a72d24e069c7258ec38640e

Merge branch 'for-3.0' into for-3.1

sound/soc/blackfin/bf5xx-ad1836.c

diff --git a/sound/soc/blackfin/bf5xx-ad1836.c b/sound/soc/blackfin/bf5xx-ad1836.c
index ea4951c..f79d165 100644
--- a/sound/soc/blackfin/bf5xx-ad1836.c
+++ b/sound/soc/blackfin/bf5xx-ad1836.c
@@ -75,7 +75,7 @@
 		.cpu_dai_name = "bfin-tdm.0",
 		.codec_dai_name = "ad1836-hifi",
 		.platform_name = "bfin-tdm-pcm-audio",
-		.codec_name = "ad1836.0",
+		.codec_name = "spi0.4",
 		.ops = &bf5xx_ad1836_ops,
 	},
 	{
@@ -84,7 +84,7 @@
 		.cpu_dai_name = "bfin-tdm.1",
 		.codec_dai_name = "ad1836-hifi",
 		.platform_name = "bfin-tdm-pcm-audio",
-		.codec_name = "ad1836.0",
+		.codec_name = "spi0.4",
 		.ops = &bf5xx_ad1836_ops,
 	},
 };