diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-11-21 02:27:04 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-11-21 02:27:04 -0500 |
| commit | 75a287d9a35a825cb758d2f8d8df93d41f9f8e3e (patch) | |
| tree | 7aacf881315a16695e35ca810434e42666d26a55 /Documentation | |
| parent | 1725b82a6e2721612a3572d0336f51f1f1c3cf54 (diff) | |
| parent | 3a7abfd2ba26479615b81ac5e90d0122ef7f9fe0 (diff) | |
Merge branch 'topic/fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_sigmatel.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index e55081fdc8ab..1b7e36af0f0e 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
| @@ -1078,6 +1078,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 1078 | ref Reference board | 1078 | ref Reference board |
| 1079 | dell-m4-1 Dell desktops | 1079 | dell-m4-1 Dell desktops |
| 1080 | dell-m4-2 Dell desktops | 1080 | dell-m4-2 Dell desktops |
| 1081 | dell-m4-3 Dell desktops | ||
| 1081 | 1082 | ||
| 1082 | STAC92HD73* | 1083 | STAC92HD73* |
| 1083 | ref Reference board | 1084 | ref Reference board |