diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-14 10:15:29 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-14 10:15:29 -0400 |
| commit | f3fbba6efbab93b9850821d41a75b02286d18315 (patch) | |
| tree | e2a680674d334c6e455d1a89a4dbfc3f549cb6d1 /Documentation/sound/alsa | |
| parent | 15c5ab607045e278ebf4d2ca4aea2250617d50ca (diff) | |
| parent | 147fcf1c211f1a87bf4d0711b7e9637f3d6ce080 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'Documentation/sound/alsa')
| -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 ce46fa1e643..37c6aad5e59 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt | |||
| @@ -296,6 +296,7 @@ Conexant 5051 | |||
| 296 | Conexant 5066 | 296 | Conexant 5066 |
| 297 | ============= | 297 | ============= |
| 298 | laptop Basic Laptop config (default) | 298 | laptop Basic Laptop config (default) |
| 299 | hp-laptop HP laptops, e g G60 | ||
| 299 | dell-laptop Dell laptops | 300 | dell-laptop Dell laptops |
| 300 | dell-vostro Dell Vostro | 301 | dell-vostro Dell Vostro |
| 301 | olpc-xo-1_5 OLPC XO 1.5 | 302 | olpc-xo-1_5 OLPC XO 1.5 |