diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-26 12:14:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-26 12:14:46 -0700 |
| commit | 878a4f521bfe83c49694ac990058080fbe090812 (patch) | |
| tree | 6ab515acea68b2f33c182a5e2d8fe9637a7ce8bf /Documentation | |
| parent | 733be82e7d41b9f932118f021704b5289d527231 (diff) | |
| parent | 461c6c3a0a23a8fac1a4b636e93ff5dfe599a241 (diff) | |
| download | linux-878a4f521bfe83c49694ac990058080fbe090812.tar.gz linux-878a4f521bfe83c49694ac990058080fbe090812.tar.bz2 linux-878a4f521bfe83c49694ac990058080fbe090812.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Add missing check of pin vref 50 and others in Realtek codecs
ALSA: hda - Add 5stack-no-fp model for STAC927x
ALSA: hda - Add forced codec-slots for ASUS W5Fm
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index 8eec05bc079e..322869fc8a9e 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt @@ -334,6 +334,7 @@ STAC9227/9228/9229/927x ref-no-jd Reference board without HP/Mic jack detection 3stack D965 3stack 5stack D965 5stack + SPDIF + 5stack-no-fp D965 5stack without front panel dell-3stack Dell Dimension E520 dell-bios Fixes with Dell BIOS setup auto BIOS setup (default) |