diff --git a/[refs] b/[refs]
index 1e68b156bf1f..78e4191b80db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 149c53b514d0a42abbb2c9611ffc9fa2d94857e8
+refs/heads/master: 20731c759a7c6877d1fe619c81b8ab9caebc8f96
diff --git a/trunk/sound/soc/fsl/Kconfig b/trunk/sound/soc/fsl/Kconfig
index aa14fc9744cc..d23d612381e8 100644
--- a/trunk/sound/soc/fsl/Kconfig
+++ b/trunk/sound/soc/fsl/Kconfig
@@ -16,10 +16,6 @@ if SND_POWERPC_SOC
 config SND_MPC52xx_DMA
 	tristate
 
-config SND_SOC_FSL_SSI
-	tristate
-	depends on FSL_SOC
-
 config SND_SOC_POWERPC_DMA
 	tristate
 	depends on FSL_SOC