diff options
Diffstat (limited to 'sound/soc/pxa/tosa.c')
-rw-r--r-- | sound/soc/pxa/tosa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index afefe41b8c46..9d9be5a14d14 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c | |||
@@ -38,7 +38,7 @@ | |||
38 | #include "pxa2xx-pcm.h" | 38 | #include "pxa2xx-pcm.h" |
39 | #include "pxa2xx-ac97.h" | 39 | #include "pxa2xx-ac97.h" |
40 | 40 | ||
41 | static struct snd_soc_machine tosa; | 41 | static struct snd_soc_card tosa; |
42 | 42 | ||
43 | #define TOSA_HP 0 | 43 | #define TOSA_HP 0 |
44 | #define TOSA_MIC_INT 1 | 44 | #define TOSA_MIC_INT 1 |
@@ -230,14 +230,14 @@ static struct snd_soc_dai_link tosa_dai[] = { | |||
230 | }, | 230 | }, |
231 | }; | 231 | }; |
232 | 232 | ||
233 | static struct snd_soc_machine tosa = { | 233 | static struct snd_soc_card tosa = { |
234 | .name = "Tosa", | 234 | .name = "Tosa", |
235 | .dai_link = tosa_dai, | 235 | .dai_link = tosa_dai, |
236 | .num_links = ARRAY_SIZE(tosa_dai), | 236 | .num_links = ARRAY_SIZE(tosa_dai), |
237 | }; | 237 | }; |
238 | 238 | ||
239 | static struct snd_soc_device tosa_snd_devdata = { | 239 | static struct snd_soc_device tosa_snd_devdata = { |
240 | .machine = &tosa, | 240 | .card = &tosa, |
241 | .platform = &pxa2xx_soc_platform, | 241 | .platform = &pxa2xx_soc_platform, |
242 | .codec_dev = &soc_codec_dev_wm9712, | 242 | .codec_dev = &soc_codec_dev_wm9712, |
243 | }; | 243 | }; |