From 812377c64eb3779947787e2fe553ee7fc32b7898 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 8 Dec 2011 00:15:39 +0800
Subject: [PATCH] --- yaml --- r: 283899 b: refs/heads/master c:
 bf4df93593af5dea01c93740956f6c77270b3036 h: refs/heads/master i:   283897:
 f87767e27be39b6d20e77b5d6fc1dbad95aeac1f   283895:
 c8173cb4ba413d48551ec7397d13cff7b856ca24 v: v3

---
 [refs]                                    | 2 +-
 trunk/sound/soc/samsung/jive_wm8750.c     | 3 +--
 trunk/sound/soc/samsung/smdk2443_wm9710.c | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 920d9e643601..5def17d5e151 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 209e8cf668d3f421eb6d86eb62451396fb0a737d
+refs/heads/master: bf4df93593af5dea01c93740956f6c77270b3036
diff --git a/trunk/sound/soc/samsung/jive_wm8750.c b/trunk/sound/soc/samsung/jive_wm8750.c
index 1826acf20f7c..8e523fd9189e 100644
--- a/trunk/sound/soc/samsung/jive_wm8750.c
+++ b/trunk/sound/soc/samsung/jive_wm8750.c
@@ -101,7 +101,6 @@ static int jive_wm8750_init(struct snd_soc_pcm_runtime *rtd)
 {
 	struct snd_soc_codec *codec = rtd->codec;
 	struct snd_soc_dapm_context *dapm = &codec->dapm;
-	int err;
 
 	/* These endpoints are not being used. */
 	snd_soc_dapm_nc_pin(dapm, "LINPUT2");
@@ -131,7 +130,7 @@ static struct snd_soc_card snd_soc_machine_jive = {
 	.dai_link	= &jive_dai,
 	.num_links	= 1,
 
-	.dapm_widgtets	= wm8750_dapm_widgets,
+	.dapm_widgets	= wm8750_dapm_widgets,
 	.num_dapm_widgets = ARRAY_SIZE(wm8750_dapm_widgets),
 	.dapm_routes	= audio_map,
 	.num_dapm_routes = ARRAY_SIZE(audio_map),
diff --git a/trunk/sound/soc/samsung/smdk2443_wm9710.c b/trunk/sound/soc/samsung/smdk2443_wm9710.c
index 3a0dbfc793f0..8bd1dc5706bf 100644
--- a/trunk/sound/soc/samsung/smdk2443_wm9710.c
+++ b/trunk/sound/soc/samsung/smdk2443_wm9710.c
@@ -12,6 +12,7 @@
  *
  */
 
+#include <linux/module.h>
 #include <sound/soc.h>
 
 static struct snd_soc_card smdk2443;