diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/sound/alsa/soc/machine.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/sound/alsa/soc/machine.txt b/Documentation/sound/alsa/soc/machine.txt index f370e7db86af..4a9f51e2905c 100644 --- a/Documentation/sound/alsa/soc/machine.txt +++ b/Documentation/sound/alsa/soc/machine.txt | |||
@@ -9,7 +9,7 @@ the audio subsystem with the kernel as a platform device and is represented by | |||
9 | the following struct:- | 9 | the following struct:- |
10 | 10 | ||
11 | /* SoC machine */ | 11 | /* SoC machine */ |
12 | struct snd_soc_machine { | 12 | struct snd_soc_card {_ |
13 | char *name; | 13 | char *name; |
14 | 14 | ||
15 | int (*probe)(struct platform_device *pdev); | 15 | int (*probe)(struct platform_device *pdev); |
@@ -67,10 +67,10 @@ static struct snd_soc_dai_link corgi_dai = { | |||
67 | .ops = &corgi_ops, | 67 | .ops = &corgi_ops, |
68 | }; | 68 | }; |
69 | 69 | ||
70 | struct snd_soc_machine then sets up the machine with it's DAIs. e.g. | 70 | struct snd_soc_card then sets up the machine with it's DAIs. e.g. |
71 | 71 | ||
72 | /* corgi audio machine driver */ | 72 | /* corgi audio machine driver */ |
73 | static struct snd_soc_machine snd_soc_machine_corgi = { | 73 | static struct snd_soc_card snd_soc_corgi = { |
74 | .name = "Corgi", | 74 | .name = "Corgi", |
75 | .dai_link = &corgi_dai, | 75 | .dai_link = &corgi_dai, |
76 | .num_links = 1, | 76 | .num_links = 1, |
@@ -90,7 +90,7 @@ static struct wm8731_setup_data corgi_wm8731_setup = { | |||
90 | 90 | ||
91 | /* corgi audio subsystem */ | 91 | /* corgi audio subsystem */ |
92 | static struct snd_soc_device corgi_snd_devdata = { | 92 | static struct snd_soc_device corgi_snd_devdata = { |
93 | .machine = &snd_soc_machine_corgi, | 93 | .machine = &snd_soc_corgi, |
94 | .platform = &pxa2xx_soc_platform, | 94 | .platform = &pxa2xx_soc_platform, |
95 | .codec_dev = &soc_codec_dev_wm8731, | 95 | .codec_dev = &soc_codec_dev_wm8731, |
96 | .codec_data = &corgi_wm8731_setup, | 96 | .codec_data = &corgi_wm8731_setup, |