diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-30 15:55:10 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-30 15:55:10 -0500 |
| commit | 8fa4d8702de3b32854344635667290776d1a754b (patch) | |
| tree | d3571a3f476c199bcfc7cd493ee22472045b58ad /Documentation | |
| parent | ed656d8deccc5669afa33387568e7ec6f14e3e94 (diff) | |
| parent | cc0db22afd9b963a4a78b634d360033bdda37650 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Fix Oops at reloading beep devices
ALSA: hda - Don't cache beep controls
ALSA: Fix a typo in Procfile.txt
ALSA: sound/arm: Fix build failure caused by missing struct aaci definition
ALSA: hda - use snd_hda_jack_detect() again in patch_sigmatel.c
ALSA: hda - Disable tigger at pin-sensing on AD codecs
ALSA: hda - HDMI sticky stream tag support
ALSA: Fix indentation in pcm_native.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/sound/alsa/Procfile.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/Procfile.txt b/Documentation/sound/alsa/Procfile.txt index 719a819f8cc2..07301de12cc4 100644 --- a/Documentation/sound/alsa/Procfile.txt +++ b/Documentation/sound/alsa/Procfile.txt | |||
| @@ -95,7 +95,7 @@ card*/pcm*/xrun_debug | |||
| 95 | It takes an integer value, can be changed by writing to this | 95 | It takes an integer value, can be changed by writing to this |
| 96 | file, such as | 96 | file, such as |
| 97 | 97 | ||
| 98 | # cat 5 > /proc/asound/card0/pcm0p/xrun_debug | 98 | # echo 5 > /proc/asound/card0/pcm0p/xrun_debug |
| 99 | 99 | ||
| 100 | The value consists of the following bit flags: | 100 | The value consists of the following bit flags: |
| 101 | bit 0 = Enable XRUN/jiffies debug messages | 101 | bit 0 = Enable XRUN/jiffies debug messages |