diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-01-12 03:59:18 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-01-12 03:59:18 -0500 |
commit | 9e4ce164ee3a1d07580f017069c25d180b0aa785 (patch) | |
tree | 7569661eae727a5a349e4c98dba42ca681857462 /Documentation/sound | |
parent | 627b79628f56c3deeb17dec1edf6899b49552fa4 (diff) | |
parent | f2cbba7602383cd9cdd21f0a5d0b8bd1aad47b33 (diff) |
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 | |||
42 | 42 | ||
43 | ALC262 | 43 | ALC262 |
44 | ====== | 44 | ====== |
45 | fujitsu Fujitsu Laptop | 45 | N/A |
46 | benq Benq ED8 | ||
47 | benq-t31 Benq T31 | ||
48 | hippo Hippo (ATI) with jack detection, Sony UX-90s | ||
49 | hippo_1 Hippo (Benq) with jack detection | ||
50 | toshiba-s06 Toshiba S06 | ||
51 | toshiba-rx1 Toshiba RX1 | ||
52 | tyan Tyan Thunder n6650W (S2915-E) | ||
53 | ultra Samsung Q1 Ultra Vista model | ||
54 | lenovo-3000 Lenovo 3000 y410 | ||
55 | nec NEC Versa S9100 | ||
56 | basic fixed pin assignment w/o SPDIF | ||
57 | auto auto-config reading BIOS (default) | ||
58 | 46 | ||
59 | ALC267/268 | 47 | ALC267/268 |
60 | ========== | 48 | ========== |
@@ -350,7 +338,6 @@ STAC92HD83* | |||
350 | mic-ref Reference board with power management for ports | 338 | mic-ref Reference board with power management for ports |
351 | dell-s14 Dell laptop | 339 | dell-s14 Dell laptop |
352 | dell-vostro-3500 Dell Vostro 3500 laptop | 340 | dell-vostro-3500 Dell Vostro 3500 laptop |
353 | hp HP laptops with (inverted) mute-LED | ||
354 | hp-dv7-4000 HP dv-7 4000 | 341 | hp-dv7-4000 HP dv-7 4000 |
355 | auto BIOS setup (default) | 342 | auto BIOS setup (default) |
356 | 343 | ||