Merge branch 'for-3.2' into for-3.3
This commit is contained in:
commit
bf4df93593
|
@ -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),
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <sound/soc.h>
|
||||
|
||||
static struct snd_soc_card smdk2443;
|
||||
|
|
Loading…
Reference in a new issue