diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-25 11:40:25 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-25 11:40:25 +0100 |
| commit | 5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57 (patch) | |
| tree | 6b932687edc73c07e544ccba3f0130fdb257d902 /Documentation/sound | |
| parent | facef8685b3ff95c01c33d9d836401d0dd26211d (diff) | |
| parent | 472346da9cc4231bec03ff2032e0d5fd4037232c (diff) | |
| download | linux-3.10-5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57.tar.gz linux-3.10-5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57.tar.bz2 linux-3.10-5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57.zip | |
Merge branch 'topic/asoc' into to-push
Diffstat (limited to 'Documentation/sound')
| -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 f370e7db86a..bab7711ce96 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, |