aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/atmel
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/atmel')
-rw-r--r--sound/soc/atmel/playpaq_wm8510.c4
-rw-r--r--sound/soc/atmel/sam9g20_wm8731.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/atmel/playpaq_wm8510.c b/sound/soc/atmel/playpaq_wm8510.c
index ea7935d2a66d..d40b5a52a8d2 100644
--- a/sound/soc/atmel/playpaq_wm8510.c
+++ b/sound/soc/atmel/playpaq_wm8510.c
@@ -361,7 +361,7 @@ static struct snd_soc_dai_link playpaq_wm8510_dai = {
361 361
362 362
363 363
364static struct snd_soc_machine snd_soc_machine_playpaq = { 364static struct snd_soc_card snd_soc_playpaq = {
365 .name = "LRS_PlayPaq_WM8510", 365 .name = "LRS_PlayPaq_WM8510",
366 .dai_link = &playpaq_wm8510_dai, 366 .dai_link = &playpaq_wm8510_dai,
367 .num_links = 1, 367 .num_links = 1,
@@ -377,7 +377,7 @@ static struct wm8510_setup_data playpaq_wm8510_setup = {
377 377
378 378
379static struct snd_soc_device playpaq_wm8510_snd_devdata = { 379static struct snd_soc_device playpaq_wm8510_snd_devdata = {
380 .machine = &snd_soc_machine_playpaq, 380 .card = &snd_soc_playpaq,
381 .platform = &at32_soc_platform, 381 .platform = &at32_soc_platform,
382 .codec_dev = &soc_codec_dev_wm8510, 382 .codec_dev = &soc_codec_dev_wm8510,
383 .codec_data = &playpaq_wm8510_setup, 383 .codec_data = &playpaq_wm8510_setup,
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
index 710addcc66b3..fdc1d0206e0b 100644
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
@@ -242,7 +242,7 @@ static struct snd_soc_dai_link at91sam9g20ek_dai = {
242 .ops = &at91sam9g20ek_ops, 242 .ops = &at91sam9g20ek_ops,
243}; 243};
244 244
245static struct snd_soc_machine snd_soc_machine_at91sam9g20ek = { 245static struct snd_soc_card snd_soc_at91sam9g20ek = {
246 .name = "WM8731", 246 .name = "WM8731",
247 .dai_link = &at91sam9g20ek_dai, 247 .dai_link = &at91sam9g20ek_dai,
248 .num_links = 1, 248 .num_links = 1,
@@ -254,7 +254,7 @@ static struct wm8731_setup_data at91sam9g20ek_wm8731_setup = {
254}; 254};
255 255
256static struct snd_soc_device at91sam9g20ek_snd_devdata = { 256static struct snd_soc_device at91sam9g20ek_snd_devdata = {
257 .machine = &snd_soc_machine_at91sam9g20ek, 257 .card = &snd_soc_at91sam9g20ek,
258 .platform = &atmel_soc_platform, 258 .platform = &atmel_soc_platform,
259 .codec_dev = &soc_codec_dev_wm8731, 259 .codec_dev = &soc_codec_dev_wm8731,
260 .codec_data = &at91sam9g20ek_wm8731_setup, 260 .codec_data = &at91sam9g20ek_wm8731_setup,