From bbe156c57877bf6bc7f61c4499f017e942a968fb Mon Sep 17 00:00:00 2001
From: Jassi Brar <jassi.brar@samsung.com>
Date: Mon, 20 Dec 2010 11:05:52 +0900
Subject: [PATCH] --- yaml --- r: 230428 b: refs/heads/master c:
 dc6ee063937f7d2e79cd1ae1596a6fe896ffa3f9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0c981d24e850..3bb890475393 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de4987ab104da973deeb651166960d4aae19812d
+refs/heads/master: dc6ee063937f7d2e79cd1ae1596a6fe896ffa3f9
diff --git a/trunk/sound/soc/samsung/Kconfig b/trunk/sound/soc/samsung/Kconfig
index c8aa73eb39c3..1e73f7079567 100644
--- a/trunk/sound/soc/samsung/Kconfig
+++ b/trunk/sound/soc/samsung/Kconfig
@@ -1,6 +1,6 @@
 config ASOC_SAMSUNG
 	tristate "ASoC support for Samsung"
-	depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0
+	depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_S5P6442
 	select S3C64XX_DMA if ARCH_S3C64XX
 	select S3C2410_DMA if ARCH_S3C2410
 	help
@@ -62,7 +62,7 @@ config ASOC_SAMSUNG_JIVE_WM8750
 
 config ASOC_SAMSUNG_SMDK_WM8580
 	tristate "SoC I2S Audio support for WM8580 on SMDK"
-	depends on ASOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDK6440 || MACH_SMDK6450)
+	depends on ASOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDK6440 || MACH_SMDK6450 || MACH_SMDK6442)
 	select SND_SOC_WM8580
 	select SND_SAMSUNG_I2S
 	help
diff --git a/trunk/sound/soc/samsung/smdk_wm8580.c b/trunk/sound/soc/samsung/smdk_wm8580.c
index e4f3bc8c1248..c149f73adac8 100644
--- a/trunk/sound/soc/samsung/smdk_wm8580.c
+++ b/trunk/sound/soc/samsung/smdk_wm8580.c
@@ -254,7 +254,7 @@ static int __init smdk_audio_init(void)
 	int ret;
 	char *str;
 
-	if (machine_is_smdkc100()) {
+	if (machine_is_smdkc100() || machine_is_smdk6442()) {
 		smdk.num_links = 3;
 		/* Secondary is at offset SAMSUNG_I2S_SECOFF from Primary */
 		str = (char *)smdk_dai[SEC_PLAYBACK].cpu_dai_name;