From 47cab9121c1fa70abb5209aa4b2c2afd5d008c84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
Date: Mon, 19 Jul 2010 10:40:32 +0200
Subject: [PATCH] --- yaml --- r: 206610 b: refs/heads/master c:
 8a0bbbeb588f2b0cbb2f69699926f32d2cda5138 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/sound/soc/imx/Kconfig         | 2 +-
 trunk/sound/soc/imx/eukrea-tlv320.c | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a29f1c3850d4..146e644ccc0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50e8ce14698273d3c493b2e66f323f6b18eac099
+refs/heads/master: 8a0bbbeb588f2b0cbb2f69699926f32d2cda5138
diff --git a/trunk/sound/soc/imx/Kconfig b/trunk/sound/soc/imx/Kconfig
index 2f0d6d3e75dc..52dac5e3874c 100644
--- a/trunk/sound/soc/imx/Kconfig
+++ b/trunk/sound/soc/imx/Kconfig
@@ -32,6 +32,6 @@ config SND_SOC_EUKREA_TLV320
 	select SND_SOC_TLV320AIC23
 	help
 	  Enable I2S based access to the TLV320AIC23B codec attached
-	  to the SSI4 interface
+	  to the SSI interface
 
 endif	# SND_IMX_SOC
diff --git a/trunk/sound/soc/imx/eukrea-tlv320.c b/trunk/sound/soc/imx/eukrea-tlv320.c
index 45f5e4b32cb5..f15dfbdc47ee 100644
--- a/trunk/sound/soc/imx/eukrea-tlv320.c
+++ b/trunk/sound/soc/imx/eukrea-tlv320.c
@@ -101,7 +101,8 @@ static int __init eukrea_tlv320_init(void)
 {
 	int ret;
 
-	if (!machine_is_eukrea_cpuimx27() && !machine_is_eukrea_cpuimx25sd())
+	if (!machine_is_eukrea_cpuimx27() && !machine_is_eukrea_cpuimx25sd()
+		&& !machine_is_eukrea_cpuimx35sd())
 		/* return happy. We might run on a totally different machine */
 		return 0;