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 | |
| parent | facef8685b3ff95c01c33d9d836401d0dd26211d (diff) | |
| parent | 472346da9cc4231bec03ff2032e0d5fd4037232c (diff) | |
Merge branch 'topic/asoc' into to-push
139 files changed, 12650 insertions, 4385 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 { |