diff options
author | Mike Travis <travis@sgi.com> | 2008-12-31 20:34:16 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-03 12:53:31 -0500 |
commit | 7eb19553369c46cc1fa64caf120cbcab1b597f7c (patch) | |
tree | ef1a3beae706b9497c845d0a2557ceb4d2754998 /Documentation/sound/alsa/Procfile.txt | |
parent | 6092848a2a23b660150a38bc06f59d75838d70c8 (diff) | |
parent | 8c384cdee3e04d6194a2c2b192b624754f990835 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into merge-rr-cpumask
Conflicts:
arch/x86/kernel/io_apic.c
kernel/rcuclassic.c
kernel/sched.c
kernel/time/tick-sched.c
Signed-off-by: Mike Travis <travis@sgi.com>
[ mingo@elte.hu: backmerged typo fix for io_apic.c ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/sound/alsa/Procfile.txt')
-rw-r--r-- | Documentation/sound/alsa/Procfile.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/Procfile.txt b/Documentation/sound/alsa/Procfile.txt index f738b296440a..bba2dbb79d81 100644 --- a/Documentation/sound/alsa/Procfile.txt +++ b/Documentation/sound/alsa/Procfile.txt | |||
@@ -153,6 +153,16 @@ card*/codec#* | |||
153 | Shows the general codec information and the attribute of each | 153 | Shows the general codec information and the attribute of each |
154 | widget node. | 154 | widget node. |
155 | 155 | ||
156 | card*/eld#* | ||
157 | Available for HDMI or DisplayPort interfaces. | ||
158 | Shows ELD(EDID Like Data) info retrieved from the attached HDMI sink, | ||
159 | and describes its audio capabilities and configurations. | ||
160 | |||
161 | Some ELD fields may be modified by doing `echo name hex_value > eld#*`. | ||
162 | Only do this if you are sure the HDMI sink provided value is wrong. | ||
163 | And if that makes your HDMI audio work, please report to us so that we | ||
164 | can fix it in future kernel releases. | ||
165 | |||
156 | 166 | ||
157 | Sequencer Information | 167 | Sequencer Information |
158 | --------------------- | 168 | --------------------- |