diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-07 17:15:39 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-07 17:15:39 +0100 |
| commit | bf4df93593af5dea01c93740956f6c77270b3036 (patch) | |
| tree | 4d1f5dc70aff6967ee1cadefb667f7cfa9c56c56 /sound/soc/samsung | |
| parent | ASoC: Convert e800_wm9712 to use gpio_request_one() (diff) | |
| parent | ASoC: Include linux/module.h for smdk2443_wm9710 (diff) | |
| download | linux-bf4df93593af5dea01c93740956f6c77270b3036.tar.xz linux-bf4df93593af5dea01c93740956f6c77270b3036.zip | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/samsung')
| -rw-r--r-- | sound/soc/samsung/jive_wm8750.c | 3 | ||||
| -rw-r--r-- | sound/soc/samsung/smdk2443_wm9710.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/samsung/jive_wm8750.c b/sound/soc/samsung/jive_wm8750.c index 1826acf20f7c..8e523fd9189e 100644 --- a/sound/soc/samsung/jive_wm8750.c +++ b/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/sound/soc/samsung/smdk2443_wm9710.c b/sound/soc/samsung/smdk2443_wm9710.c index 3a0dbfc793f0..8bd1dc5706bf 100644 --- a/sound/soc/samsung/smdk2443_wm9710.c +++ b/sound/soc/samsung/smdk2443_wm9710.c @@ -12,6 +12,7 @@ * */ +#include <linux/module.h> #include <sound/soc.h> static struct snd_soc_card smdk2443; |