diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-29 12:05:04 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-29 12:05:04 -0400 |
| commit | cdae219cec501ae4fba60e92c7a2a3aad1625b8d (patch) | |
| tree | 7b5494f21d1459f2dd1ee9f6e08f682140a0a3f4 /Documentation | |
| parent | ae77b4ed4fd11e67f8b02ca7ee882a636ee20a97 (diff) | |
| parent | c912e7a58054304575fe88574c776be7e684098e (diff) | |
Merge branch 'fix/hda-samsung-p50' into for-linus
* fix/hda-samsung-p50:
ALSA: hda - Fix support for Samsung P50 with AD1986A codec
ALSA: hda - Generalize the pin-detect quirk for Lenovo N100
ALSA: hda - Simplify AD1986A mixer definitions
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 0d8d23581c44..939a3dd58148 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt | |||
| @@ -240,6 +240,7 @@ AD1986A | |||
| 240 | laptop-automute 2-channel with EAPD and HP-automute (Lenovo N100) | 240 | laptop-automute 2-channel with EAPD and HP-automute (Lenovo N100) |
| 241 | ultra 2-channel with EAPD (Samsung Ultra tablet PC) | 241 | ultra 2-channel with EAPD (Samsung Ultra tablet PC) |
| 242 | samsung 2-channel with EAPD (Samsung R65) | 242 | samsung 2-channel with EAPD (Samsung R65) |
| 243 | samsung-p50 2-channel with HP-automute (Samsung P50) | ||
| 243 | 244 | ||
| 244 | AD1988/AD1988B/AD1989A/AD1989B | 245 | AD1988/AD1988B/AD1989A/AD1989B |
| 245 | ============================== | 246 | ============================== |