diff --git a/[refs] b/[refs]
index 39160dcc1855..40e3293b272e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57d9a477f908cd20c1b4da06fdfe864722487d8b
+refs/heads/master: 4ac7903f1d2cc3dce289d15ce6a6929e935983f5
diff --git a/trunk/sound/soc/codecs/ab8500-codec.c b/trunk/sound/soc/codecs/ab8500-codec.c
index 3f46bffeb0c3..2c1c2524ef8c 100644
--- a/trunk/sound/soc/codecs/ab8500-codec.c
+++ b/trunk/sound/soc/codecs/ab8500-codec.c
@@ -2404,9 +2404,6 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec)
 
 	dev_dbg(dev, "%s: Enter.\n", __func__);
 
-	/* Inform SoC Core that we have our own I/O arrangements. */
-	codec->control_data = (void *)true;
-
 	/* Setup AB8500 according to board-settings */
 	pdata = dev_get_platdata(dev->parent);