diff options
Diffstat (limited to 'sound/soc/imx/wm1133-ev1.c')
-rw-r--r-- | sound/soc/imx/wm1133-ev1.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/imx/wm1133-ev1.c b/sound/soc/imx/wm1133-ev1.c index 30fdb15065be..75b4c72787e2 100644 --- a/sound/soc/imx/wm1133-ev1.c +++ b/sound/soc/imx/wm1133-ev1.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <sound/pcm.h> | 19 | #include <sound/pcm.h> |
20 | #include <sound/pcm_params.h> | 20 | #include <sound/pcm_params.h> |
21 | #include <sound/soc.h> | 21 | #include <sound/soc.h> |
22 | #include <sound/soc-dapm.h> | ||
23 | 22 | ||
24 | #include <mach/audmux.h> | 23 | #include <mach/audmux.h> |
25 | 24 | ||
@@ -213,11 +212,12 @@ static struct snd_soc_jack_pin mic_jack_pins[] = { | |||
213 | static int wm1133_ev1_init(struct snd_soc_pcm_runtime *rtd) | 212 | static int wm1133_ev1_init(struct snd_soc_pcm_runtime *rtd) |
214 | { | 213 | { |
215 | struct snd_soc_codec *codec = rtd->codec; | 214 | struct snd_soc_codec *codec = rtd->codec; |
215 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
216 | 216 | ||
217 | snd_soc_dapm_new_controls(codec, wm1133_ev1_widgets, | 217 | snd_soc_dapm_new_controls(dapm, wm1133_ev1_widgets, |
218 | ARRAY_SIZE(wm1133_ev1_widgets)); | 218 | ARRAY_SIZE(wm1133_ev1_widgets)); |
219 | 219 | ||
220 | snd_soc_dapm_add_routes(codec, wm1133_ev1_map, | 220 | snd_soc_dapm_add_routes(dapm, wm1133_ev1_map, |
221 | ARRAY_SIZE(wm1133_ev1_map)); | 221 | ARRAY_SIZE(wm1133_ev1_map)); |
222 | 222 | ||
223 | /* Headphone jack detection */ | 223 | /* Headphone jack detection */ |
@@ -234,7 +234,7 @@ static int wm1133_ev1_init(struct snd_soc_pcm_runtime *rtd) | |||
234 | wm8350_mic_jack_detect(codec, &mic_jack, SND_JACK_MICROPHONE, | 234 | wm8350_mic_jack_detect(codec, &mic_jack, SND_JACK_MICROPHONE, |
235 | SND_JACK_BTN_0); | 235 | SND_JACK_BTN_0); |
236 | 236 | ||
237 | snd_soc_dapm_force_enable_pin(codec, "Mic Bias"); | 237 | snd_soc_dapm_force_enable_pin(dapm, "Mic Bias"); |
238 | 238 | ||
239 | return 0; | 239 | return 0; |
240 | } | 240 | } |