From e8fa5981f1e33016af6e6fb895ab8ba41fe1e2bb Mon Sep 17 00:00:00 2001
From: Kukjin Kim <kgene.kim@samsung.com>
Date: Wed, 11 May 2011 16:28:45 +0900
Subject: [PATCH] --- yaml --- r: 252383 b: refs/heads/master c:
 4b42120df72aeebd3967c952804cb1af53b91cc5 h: refs/heads/master i:   252381:
 d431ba252b49eb009c5e84ea829e1cf672871ac0   252379:
 58e986f639dd43d511fb025e6a7eb10f1ccdbbfa   252375:
 475e68248759429f7ce2bc1dd499d0a646f06e6d   252367:
 a82f5246cd491b67c7c2ee832ff9b351624abe4e   252351:
 164657cc162eaa22df49a414509ee6410a8bf196 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 e8101cc89042..18450e176178 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a73ddc61e8f14ddc7ab6e6a11dc882ef6a697114
+refs/heads/master: 4b42120df72aeebd3967c952804cb1af53b91cc5
diff --git a/trunk/sound/soc/samsung/Kconfig b/trunk/sound/soc/samsung/Kconfig
index a3fdfb631469..4b96b18a1bb7 100644
--- a/trunk/sound/soc/samsung/Kconfig
+++ b/trunk/sound/soc/samsung/Kconfig
@@ -1,6 +1,6 @@
 config SND_SOC_SAMSUNG
 	tristate "ASoC support for Samsung"
-	depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_S5P6442 || ARCH_EXYNOS4
+	depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_EXYNOS4
 	select S3C64XX_DMA if ARCH_S3C64XX
 	select S3C2410_DMA if ARCH_S3C2410
 	help
@@ -55,7 +55,7 @@ config SND_SOC_SAMSUNG_JIVE_WM8750
 
 config SND_SOC_SAMSUNG_SMDK_WM8580
 	tristate "SoC I2S Audio support for WM8580 on SMDK"
-	depends on SND_SOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDK6440 || MACH_SMDK6450 || MACH_SMDK6442 || MACH_SMDKV210 || MACH_SMDKC110)
+	depends on SND_SOC_SAMSUNG && (MACH_SMDK6410 || MACH_SMDKC100 || MACH_SMDK6440 || MACH_SMDK6450 || MACH_SMDKV210 || MACH_SMDKC110)
 	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 8aacf23d6f3a..3d26f6607aa4 100644
--- a/trunk/sound/soc/samsung/smdk_wm8580.c
+++ b/trunk/sound/soc/samsung/smdk_wm8580.c
@@ -249,7 +249,7 @@ static int __init smdk_audio_init(void)
 	int ret;
 	char *str;
 
-	if (machine_is_smdkc100() || machine_is_smdk6442()
+	if (machine_is_smdkc100()
 			|| machine_is_smdkv210() || machine_is_smdkc110()) {
 		smdk.num_links = 3;
 		/* Secondary is at offset SAMSUNG_I2S_SECOFF from Primary */