diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-01-12 09:59:18 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-01-12 09:59:18 +0100 |
commit | 9e4ce164ee3a1d07580f017069c25d180b0aa785 (patch) | |
tree | 7569661eae727a5a349e4c98dba42ca681857462 /Documentation/sound | |
parent | 627b79628f56c3deeb17dec1edf6899b49552fa4 (diff) | |
parent | f2cbba7602383cd9cdd21f0a5d0b8bd1aad47b33 (diff) | |
download | linux-stable-9e4ce164ee3a1d07580f017069c25d180b0aa785.tar.gz linux-stable-9e4ce164ee3a1d07580f017069c25d180b0aa785.tar.bz2 linux-stable-9e4ce164ee3a1d07580f017069c25d180b0aa785.zip |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'Documentation/sound')
-rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index edad99abec21..c8c54544abc5 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt @@ -42,19 +42,7 @@ ALC260 ALC262 ====== - fujitsu Fujitsu Laptop - benq Benq ED8 - benq-t31 Benq T31 - hippo Hippo (ATI) with jack detection, Sony UX-90s - hippo_1 Hippo (Benq) with jack detection - toshiba-s06 Toshiba S06 - toshiba-rx1 Toshiba RX1 - tyan Tyan Thunder n6650W (S2915-E) - ultra Samsung Q1 Ultra Vista model - lenovo-3000 Lenovo 3000 y410 - nec NEC Versa S9100 - basic fixed pin assignment w/o SPDIF - auto auto-config reading BIOS (default) + N/A ALC267/268 ========== @@ -350,7 +338,6 @@ STAC92HD83* mic-ref Reference board with power management for ports dell-s14 Dell laptop dell-vostro-3500 Dell Vostro 3500 laptop - hp HP laptops with (inverted) mute-LED hp-dv7-4000 HP dv-7 4000 auto BIOS setup (default) |