diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-09 12:16:11 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-09 12:16:11 -0500 |
commit | 8a7469064b7f601a661059e9fcd2f2deb2a8fd23 (patch) | |
tree | e4a8fe3c1b19cff752f87716ea2093560e18d4ca /Documentation/sound | |
parent | 482e46d4b7c9bfbb2edc047fafa85cee1b0fc1e1 (diff) | |
parent | 7aee67466536bbf8bb44a95712c848a61c5a0acd (diff) |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'Documentation/sound')
-rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 1 | ||||
-rw-r--r-- | Documentation/sound/alsa/HD-Audio.txt | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index 9000cd84d076..e93affff3af8 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt | |||
@@ -126,6 +126,7 @@ ALC882/883/885/888/889 | |||
126 | mb5 Macbook 5,1 | 126 | mb5 Macbook 5,1 |
127 | mbp3 Macbook Pro rev3 | 127 | mbp3 Macbook Pro rev3 |
128 | imac24 iMac 24'' with jack detection | 128 | imac24 iMac 24'' with jack detection |
129 | imac91 iMac 9,1 | ||
129 | w2jc ASUS W2JC | 130 | w2jc ASUS W2JC |
130 | 3stack-2ch-dig 3-jack with SPDIF I/O (ALC883) | 131 | 3stack-2ch-dig 3-jack with SPDIF I/O (ALC883) |
131 | alc883-6stack-dig 6-jack digital with SPDIF I/O (ALC883) | 132 | alc883-6stack-dig 6-jack digital with SPDIF I/O (ALC883) |
diff --git a/Documentation/sound/alsa/HD-Audio.txt b/Documentation/sound/alsa/HD-Audio.txt index 7b8a5f947d1d..6325bec06a72 100644 --- a/Documentation/sound/alsa/HD-Audio.txt +++ b/Documentation/sound/alsa/HD-Audio.txt | |||
@@ -624,11 +624,13 @@ hda-verb. The program gives you an easy-to-use GUI stuff for showing | |||
624 | the widget information and adjusting the amp values, as well as the | 624 | the widget information and adjusting the amp values, as well as the |
625 | proc-compatible output. | 625 | proc-compatible output. |
626 | 626 | ||
627 | The hda-analyzer is a part of alsa.git repository in | 627 | The hda-analyzer: |
628 | alsa-project.org: | ||
629 | 628 | ||
630 | - http://git.alsa-project.org/?p=alsa.git;a=tree;f=hda-analyzer | 629 | - http://git.alsa-project.org/?p=alsa.git;a=tree;f=hda-analyzer |
631 | 630 | ||
631 | is a part of alsa.git repository in alsa-project.org: | ||
632 | |||
633 | - git://git.alsa-project.org/alsa.git | ||
632 | 634 | ||
633 | Codecgraph | 635 | Codecgraph |
634 | ~~~~~~~~~~ | 636 | ~~~~~~~~~~ |