diff --git a/[refs] b/[refs]
index 925a8b8a1f16..aee5105b186f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffb2c3c07f6ffd61923de736139248b31dc6f642
+refs/heads/master: 4d02031fe25c01eaa946a25e2052dd8e706edfca
diff --git a/trunk/sound/soc/s3c24xx/Kconfig b/trunk/sound/soc/s3c24xx/Kconfig
index 433da9f854af..bb6e00a1cf66 100644
--- a/trunk/sound/soc/s3c24xx/Kconfig
+++ b/trunk/sound/soc/s3c24xx/Kconfig
@@ -2,8 +2,7 @@ menu "SoC Audio for the Samsung S3C24XX"
 
 config SND_S3C24XX_SOC
 	tristate "SoC Audio for the Samsung S3C24XX chips"
-	depends on ARCH_S3C2410 && SND
-	select SND_PCM
+	depends on ARCH_S3C2410 && SND_SOC
 	help
 	  Say Y or M if you want to add support for codecs attached to
 	  the S3C24XX AC97, I2S or SSP interface. You will also need