diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-11-25 11:21:32 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-11-25 11:21:32 -0500 |
| commit | b6283534a3e057f8268ca5448305900f74d12608 (patch) | |
| tree | fcfca80ce5c053a544410b42f2aadc42236680d7 /Documentation/sound | |
| parent | c879c634c928223765cf50103ddaf32f2a55fed0 (diff) | |
| parent | 661cd8fb5210af78f0763071642e0764a10389a6 (diff) | |
Merge branch 'topic/fix/hda' into for-linus
Diffstat (limited to 'Documentation/sound')
| -rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 147f1764d976..3cd2ad958176 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
| @@ -1076,7 +1076,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 1076 | 1076 | ||
| 1077 | STAC92HD73* | 1077 | STAC92HD73* |
| 1078 | ref Reference board | 1078 | ref Reference board |
| 1079 | dell-m6 Dell desktops | 1079 | dell-m6-amic Dell desktops/laptops with analog mics |
| 1080 | dell-m6-dmic Dell desktops/laptops with digital mics | ||
| 1081 | dell-m6 Dell desktops/laptops with both type of mics | ||
| 1080 | 1082 | ||
| 1081 | STAC9872 | 1083 | STAC9872 |
| 1082 | vaio Setup for VAIO FE550G/SZ110 | 1084 | vaio Setup for VAIO FE550G/SZ110 |