diff --git a/[refs] b/[refs]
index 57028ce2c903..2b58565bc0f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a3f5e35aae43b20fef09fd800cf52cc9a2d61a8
+refs/heads/master: 8df89bc35c188e389295eaf7917653f13c83ce70
diff --git a/trunk/sound/soc/omap/Kconfig b/trunk/sound/soc/omap/Kconfig
index bb5731a22bed..4dc6b15a852f 100644
--- a/trunk/sound/soc/omap/Kconfig
+++ b/trunk/sound/soc/omap/Kconfig
@@ -43,12 +43,13 @@ config SND_OMAP_SOC_OSK5912
 	  Say Y if you want to add support for SoC audio on osk5912.
 
 config SND_OMAP_SOC_OVERO
-	tristate "SoC Audio support for Gumstix Overo"
-	depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OVERO
+	tristate "SoC Audio support for Gumstix Overo and CompuLab CM-T35"
+	depends on TWL4030_CORE && SND_OMAP_SOC && (MACH_OVERO || MACH_CM_T35)
 	select SND_OMAP_SOC_MCBSP
 	select SND_SOC_TWL4030
 	help
-	  Say Y if you want to add support for SoC audio on the Gumstix Overo.
+	  Say Y if you want to add support for SoC audio on the
+	  Gumstix Overo or CompuLab CM-T35
 
 config SND_OMAP_SOC_OMAP2EVM
 	tristate "SoC Audio support for OMAP2EVM board"
diff --git a/trunk/sound/soc/omap/overo.c b/trunk/sound/soc/omap/overo.c
index ec4f8fd8b3a2..97a4d6308bd6 100644
--- a/trunk/sound/soc/omap/overo.c
+++ b/trunk/sound/soc/omap/overo.c
@@ -107,8 +107,8 @@ static int __init overo_soc_init(void)
 {
 	int ret;
 
-	if (!machine_is_overo()) {
-		pr_debug("Not Overo!\n");
+	if (!(machine_is_overo() || machine_is_cm_t35())) {
+		pr_debug("Incomatible machine!\n");
 		return -ENODEV;
 	}
 	printk(KERN_INFO "overo SoC init\n");