diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-09 18:16:11 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-09 18:16:11 +0100 |
commit | 8a7469064b7f601a661059e9fcd2f2deb2a8fd23 (patch) | |
tree | e4a8fe3c1b19cff752f87716ea2093560e18d4ca /Documentation/sound | |
parent | ALSA: ice1724 - aureon - modify WM8770 Master & DAC volume (diff) | |
parent | ALSA: hda/realtek: quirk for D945GCLF2 mainboard (diff) | |
download | linux-8a7469064b7f601a661059e9fcd2f2deb2a8fd23.tar.xz linux-8a7469064b7f601a661059e9fcd2f2deb2a8fd23.zip |
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 mb5 Macbook 5,1 mbp3 Macbook Pro rev3 imac24 iMac 24'' with jack detection + imac91 iMac 9,1 w2jc ASUS W2JC 3stack-2ch-dig 3-jack with SPDIF I/O (ALC883) 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 the widget information and adjusting the amp values, as well as the proc-compatible output. -The hda-analyzer is a part of alsa.git repository in -alsa-project.org: +The hda-analyzer: - http://git.alsa-project.org/?p=alsa.git;a=tree;f=hda-analyzer +is a part of alsa.git repository in alsa-project.org: + +- git://git.alsa-project.org/alsa.git Codecgraph ~~~~~~~~~~ |