aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 077dfe4e51f0..3be17b3c650c 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -482,8 +482,8 @@ struct snd_soc_dai_link {
482 struct snd_pcm *pcm; 482 struct snd_pcm *pcm;
483}; 483};
484 484
485/* SoC machine */ 485/* SoC card */
486struct snd_soc_machine { 486struct snd_soc_card {
487 char *name; 487 char *name;
488 488
489 int (*probe)(struct platform_device *pdev); 489 int (*probe)(struct platform_device *pdev);
@@ -497,7 +497,7 @@ struct snd_soc_machine {
497 int (*resume_post)(struct platform_device *pdev); 497 int (*resume_post)(struct platform_device *pdev);
498 498
499 /* callbacks */ 499 /* callbacks */
500 int (*set_bias_level)(struct snd_soc_machine *, 500 int (*set_bias_level)(struct snd_soc_card *,
501 enum snd_soc_bias_level level); 501 enum snd_soc_bias_level level);
502 502
503 /* CPU <--> Codec DAI links */ 503 /* CPU <--> Codec DAI links */
@@ -508,7 +508,7 @@ struct snd_soc_machine {
508/* SoC Device - the audio subsystem */ 508/* SoC Device - the audio subsystem */
509struct snd_soc_device { 509struct snd_soc_device {
510 struct device *dev; 510 struct device *dev;
511 struct snd_soc_machine *machine; 511 struct snd_soc_card *card;
512 struct snd_soc_platform *platform; 512 struct snd_soc_platform *platform;
513 struct snd_soc_codec *codec; 513 struct snd_soc_codec *codec;
514 struct snd_soc_codec_device *codec_dev; 514 struct snd_soc_codec_device *codec_dev;