diff options
Diffstat (limited to 'sound/soc/sh/migor.c')
-rw-r--r-- | sound/soc/sh/migor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c index ac6c49ce6fd..6088a6a3238 100644 --- a/sound/soc/sh/migor.c +++ b/sound/soc/sh/migor.c | |||
@@ -8,11 +8,11 @@ | |||
8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/clkdev.h> | ||
11 | #include <linux/device.h> | 12 | #include <linux/device.h> |
12 | #include <linux/firmware.h> | 13 | #include <linux/firmware.h> |
13 | #include <linux/module.h> | 14 | #include <linux/module.h> |
14 | 15 | ||
15 | #include <asm/clkdev.h> | ||
16 | #include <asm/clock.h> | 16 | #include <asm/clock.h> |
17 | 17 | ||
18 | #include <cpu/sh7722.h> | 18 | #include <cpu/sh7722.h> |
@@ -20,7 +20,6 @@ | |||
20 | #include <sound/core.h> | 20 | #include <sound/core.h> |
21 | #include <sound/pcm.h> | 21 | #include <sound/pcm.h> |
22 | #include <sound/soc.h> | 22 | #include <sound/soc.h> |
23 | #include <sound/soc-dapm.h> | ||
24 | 23 | ||
25 | #include "../codecs/wm8978.h" | 24 | #include "../codecs/wm8978.h" |
26 | #include "siu.h" | 25 | #include "siu.h" |
@@ -140,11 +139,12 @@ static const struct snd_soc_dapm_route audio_map[] = { | |||
140 | static int migor_dai_init(struct snd_soc_pcm_runtime *rtd) | 139 | static int migor_dai_init(struct snd_soc_pcm_runtime *rtd) |
141 | { | 140 | { |
142 | struct snd_soc_codec *codec = rtd->codec; | 141 | struct snd_soc_codec *codec = rtd->codec; |
142 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
143 | 143 | ||
144 | snd_soc_dapm_new_controls(codec, migor_dapm_widgets, | 144 | snd_soc_dapm_new_controls(dapm, migor_dapm_widgets, |
145 | ARRAY_SIZE(migor_dapm_widgets)); | 145 | ARRAY_SIZE(migor_dapm_widgets)); |
146 | 146 | ||
147 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | 147 | snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); |
148 | 148 | ||
149 | return 0; | 149 | return 0; |
150 | } | 150 | } |