Merge branch 'master' into for-next

Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.

1 files changed, 1 insertions, 1 deletions

diff --git a/sound/soc/codecs/wl1273.c b/sound/soc/codecs/wl1273.c
index 5836201834d..a8549898299 100644
--- a/sound/soc/codecs/wl1273.c
+++ b/sound/soc/codecs/wl1273.c
@@ -23,6 +23,7 @@
 
 #include <linux/mfd/wl1273-core.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
@@ -462,7 +463,6 @@ static int wl1273_probe(struct snd_soc_codec *codec)
         wl1273->core = *core;
 
         snd_soc_codec_set_drvdata(codec, wl1273);
-        mutex_init(&codec->mutex);
 
         r = snd_soc_add_controls(codec, wl1273_controls,
                                  ARRAY_SIZE(wl1273_controls));