diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 13:43:57 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 13:43:57 +1100 |
commit | e47528e51a7f82c44c72208f378f3b196fb44d52 (patch) | |
tree | 16c710bce1a06fa72bc7da67daf3a5c9f9531c48 /Documentation/sound/alsa/soc/machine.txt | |
parent | fdba1c13bf39f614a548a7ae6979b62f78d11b6f (diff) | |
parent | 878ff2fcd580bc8f72877910f2ce78bd0c489273 (diff) |
Merge commit 'sound/for-next'
Diffstat (limited to 'Documentation/sound/alsa/soc/machine.txt')
-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..bab7711ce963 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 the following struct:- /* SoC machine */ -struct snd_soc_machine { +struct snd_soc_card { char *name; int (*probe)(struct platform_device *pdev); @@ -67,10 +67,10 @@ static struct snd_soc_dai_link corgi_dai = { .ops = &corgi_ops, }; -struct snd_soc_machine then sets up the machine with it's DAIs. e.g. +struct snd_soc_card then sets up the machine with it's DAIs. e.g. /* corgi audio machine driver */ -static struct snd_soc_machine snd_soc_machine_corgi = { +static struct snd_soc_card snd_soc_corgi = { .name = "Corgi", .dai_link = &corgi_dai, .num_links = 1, @@ -90,7 +90,7 @@ static struct wm8731_setup_data corgi_wm8731_setup = { /* corgi audio subsystem */ static struct snd_soc_device corgi_snd_devdata = { - .machine = &snd_soc_machine_corgi, + .machine = &snd_soc_corgi, .platform = &pxa2xx_soc_platform, .codec_dev = &soc_codec_dev_wm8731, .codec_data = &corgi_wm8731_setup, |