diff --git a/[refs] b/[refs]
index 9bb92a45c380..5879d7db6a38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f57dc8b2a05f1d69f913fd885539b8c1f8fb8a1
+refs/heads/master: 0c94161580eee8137b868301434ea392083258b5
diff --git a/trunk/sound/soc/codecs/Kconfig b/trunk/sound/soc/codecs/Kconfig
index 7ab74cd7b85e..1c934230494f 100644
--- a/trunk/sound/soc/codecs/Kconfig
+++ b/trunk/sound/soc/codecs/Kconfig
@@ -1,3 +1,26 @@
+config SND_SOC_ALL_CODECS
+	tristate "Build all ASoC CODEC drivers"
+	select I2C
+	select SPI
+	select SND_SOC_AK4535
+	select SND_SOC_UDA1380
+	select SND_SOC_WM8510
+	select SND_SOC_WM8731
+	select SND_SOC_WM8750
+	select SND_SOC_WM8753
+	select SND_SOC_WM8990
+	select SND_SOC_CS4270
+	select SND_SOC_TLV320AIC26
+	select SND_SOC_TLV320AIC3X
+        help
+          Normally ASoC codec drivers are only built if a machine driver which
+          uses them is also built since they are only usable with a machine
+          driver.  Selecting this option will allow these drivers to be built
+          without an explicit machine driver for test and development purposes.
+
+          If unsure select "N".
+
+
 config SND_SOC_AC97_CODEC
 	tristate
 	select SND_AC97_CODEC