diff options
Diffstat (limited to 'sound/soc/omap/osk5912.c')
-rw-r--r-- | sound/soc/omap/osk5912.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c index 65ae00e976ef..7e75e775fb4a 100644 --- a/sound/soc/omap/osk5912.c +++ b/sound/soc/omap/osk5912.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <sound/core.h> | 26 | #include <sound/core.h> |
27 | #include <sound/pcm.h> | 27 | #include <sound/pcm.h> |
28 | #include <sound/soc.h> | 28 | #include <sound/soc.h> |
29 | #include <sound/soc-dapm.h> | ||
30 | 29 | ||
31 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |
32 | #include <mach/hardware.h> | 31 | #include <mach/hardware.h> |
@@ -116,19 +115,20 @@ static const struct snd_soc_dapm_route audio_map[] = { | |||
116 | static int osk_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd) | 115 | static int osk_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd) |
117 | { | 116 | { |
118 | struct snd_soc_codec *codec = rtd->codec; | 117 | struct snd_soc_codec *codec = rtd->codec; |
118 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
119 | 119 | ||
120 | /* Add osk5912 specific widgets */ | 120 | /* Add osk5912 specific widgets */ |
121 | snd_soc_dapm_new_controls(codec, tlv320aic23_dapm_widgets, | 121 | snd_soc_dapm_new_controls(dapm, tlv320aic23_dapm_widgets, |
122 | ARRAY_SIZE(tlv320aic23_dapm_widgets)); | 122 | ARRAY_SIZE(tlv320aic23_dapm_widgets)); |
123 | 123 | ||
124 | /* Set up osk5912 specific audio path audio_map */ | 124 | /* Set up osk5912 specific audio path audio_map */ |
125 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | 125 | snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); |
126 | 126 | ||
127 | snd_soc_dapm_enable_pin(codec, "Headphone Jack"); | 127 | snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); |
128 | snd_soc_dapm_enable_pin(codec, "Line In"); | 128 | snd_soc_dapm_enable_pin(dapm, "Line In"); |
129 | snd_soc_dapm_enable_pin(codec, "Mic Jack"); | 129 | snd_soc_dapm_enable_pin(dapm, "Mic Jack"); |
130 | 130 | ||
131 | snd_soc_dapm_sync(codec); | 131 | snd_soc_dapm_sync(dapm); |
132 | 132 | ||
133 | return 0; | 133 | return 0; |
134 | } | 134 | } |