diff --git a/[refs] b/[refs]
index 6a11627e89b4..49888eb7e714 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68bfcafaaeebdf23fba0edb4e0964bef7d08f92a
+refs/heads/master: f8f626f537aee0da878d287e0d7694b7b76d599a
diff --git a/trunk/sound/soc/codecs/Kconfig b/trunk/sound/soc/codecs/Kconfig
index 4584514d93d4..fa787d45d74a 100644
--- a/trunk/sound/soc/codecs/Kconfig
+++ b/trunk/sound/soc/codecs/Kconfig
@@ -33,7 +33,7 @@ config SND_SOC_ALL_CODECS
 	select SND_SOC_CX20442
 	select SND_SOC_DA7210 if I2C
 	select SND_SOC_DFBMCS320
-	select SND_SOC_JZ4740_CODEC if SOC_JZ4740
+	select SND_SOC_JZ4740_CODEC
 	select SND_SOC_LM4857 if I2C
 	select SND_SOC_MAX98088 if I2C
 	select SND_SOC_MAX98095 if I2C