diff --git a/[refs] b/[refs]
index ded3399b2e65..6e9a80128c1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1dd5897f53647390a7622795541bc89f8a84fe2
+refs/heads/master: 1e1d7e593e46f884b359769b29b6d92eb3d0f1ee
diff --git a/trunk/sound/soc/imx/Kconfig b/trunk/sound/soc/imx/Kconfig
index 91b66eff531e..e89139ffbce1 100644
--- a/trunk/sound/soc/imx/Kconfig
+++ b/trunk/sound/soc/imx/Kconfig
@@ -1,7 +1,6 @@
 menuconfig SND_IMX_SOC
 	tristate "SoC Audio for Freescale i.MX CPUs"
 	depends on ARCH_MXC
-	select FIQ
 	select SND_SOC_AC97_BUS
 	help
 	  Say Y or M if you want to add support for codecs attached to
@@ -11,6 +10,7 @@ menuconfig SND_IMX_SOC
 if SND_IMX_SOC
 
 config SND_MXC_SOC_FIQ
+	select FIQ
 	tristate
 
 config SND_MXC_SOC_MX2