diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
| commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
| tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /Documentation/sound/alsa/Procfile.txt | |
| parent | f3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff) | |
| parent | a847825970e741e20a09c659978baa34016b63bc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'Documentation/sound/alsa/Procfile.txt')
| -rw-r--r-- | Documentation/sound/alsa/Procfile.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/sound/alsa/Procfile.txt b/Documentation/sound/alsa/Procfile.txt index 1fe48846d78f..f738b296440a 100644 --- a/Documentation/sound/alsa/Procfile.txt +++ b/Documentation/sound/alsa/Procfile.txt | |||
| @@ -71,7 +71,7 @@ The status of MIDI I/O is found in midi* files. It shows the device | |||
| 71 | name and the received/transmitted bytes through the MIDI device. | 71 | name and the received/transmitted bytes through the MIDI device. |
| 72 | 72 | ||
| 73 | When the card is equipped with AC97 codecs, there are codec97#* | 73 | When the card is equipped with AC97 codecs, there are codec97#* |
| 74 | subdirectories (desribed later). | 74 | subdirectories (described later). |
| 75 | 75 | ||
| 76 | When the OSS mixer emulation is enabled (and the module is loaded), | 76 | When the OSS mixer emulation is enabled (and the module is loaded), |
| 77 | oss_mixer file appears here, too. This shows the current mapping of | 77 | oss_mixer file appears here, too. This shows the current mapping of |
| @@ -161,12 +161,12 @@ seq/drivers | |||
| 161 | Lists the currently available ALSA sequencer drivers. | 161 | Lists the currently available ALSA sequencer drivers. |
| 162 | 162 | ||
| 163 | seq/clients | 163 | seq/clients |
| 164 | Shows the list of currently available sequencer clinets and | 164 | Shows the list of currently available sequencer clients and |
| 165 | ports. The connection status and the running status are shown | 165 | ports. The connection status and the running status are shown |
| 166 | in this file, too. | 166 | in this file, too. |
| 167 | 167 | ||
| 168 | seq/queues | 168 | seq/queues |
| 169 | Lists the currently allocated/running sequener queues. | 169 | Lists the currently allocated/running sequencer queues. |
| 170 | 170 | ||
| 171 | seq/timer | 171 | seq/timer |
| 172 | Lists the currently allocated/running sequencer timers. | 172 | Lists the currently allocated/running sequencer timers. |
| @@ -182,10 +182,10 @@ When the problem is related with PCM, first try to turn on xrun_debug | |||
| 182 | mode. This will give you the kernel messages when and where xrun | 182 | mode. This will give you the kernel messages when and where xrun |
| 183 | happened. | 183 | happened. |
| 184 | 184 | ||
| 185 | If it's really a bug, report it with the following information | 185 | If it's really a bug, report it with the following information: |
| 186 | 186 | ||
| 187 | - the name of the driver/card, show in /proc/asound/cards | 187 | - the name of the driver/card, show in /proc/asound/cards |
| 188 | - the reigster dump, if available (e.g. card*/cmipci) | 188 | - the register dump, if available (e.g. card*/cmipci) |
| 189 | 189 | ||
| 190 | when it's a PCM problem, | 190 | when it's a PCM problem, |
| 191 | 191 | ||