summaryrefslogtreecommitdiffstats
path: root/Documentation/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-09-14 16:15:29 +0200
committerTakashi Iwai <tiwai@suse.de>2010-09-14 16:15:29 +0200
commitf3fbba6efbab93b9850821d41a75b02286d18315 (patch)
treee2a680674d334c6e455d1a89a4dbfc3f549cb6d1 /Documentation/sound
parentALSA: snd-usb-caiaq: Add support for Traktor Kontrol S4 (diff)
parentsound: Remove pr_<level> uses of KERN_<level> (diff)
downloadlinux-f3fbba6efbab93b9850821d41a75b02286d18315.tar.xz
linux-f3fbba6efbab93b9850821d41a75b02286d18315.zip
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'Documentation/sound')
-rw-r--r--Documentation/sound/alsa/HD-Audio-Models.txt1
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 ce46fa1e643e..37c6aad5e590 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -296,6 +296,7 @@ Conexant 5051
Conexant 5066
=============
laptop Basic Laptop config (default)
+ hp-laptop HP laptops, e g G60
dell-laptop Dell laptops
dell-vostro Dell Vostro
olpc-xo-1_5 OLPC XO 1.5