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/MIXART.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/MIXART.txt')
| -rw-r--r-- | Documentation/sound/alsa/MIXART.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/sound/alsa/MIXART.txt b/Documentation/sound/alsa/MIXART.txt index 5cb970612870..ef42c44fa1f2 100644 --- a/Documentation/sound/alsa/MIXART.txt +++ b/Documentation/sound/alsa/MIXART.txt | |||
| @@ -31,7 +31,7 @@ With a miXart8AES/EBU there is in addition 1 stereo digital input | |||
| 31 | Formats | 31 | Formats |
| 32 | ------- | 32 | ------- |
| 33 | U8, S16_LE, S16_BE, S24_3LE, S24_3BE, FLOAT_LE, FLOAT_BE | 33 | U8, S16_LE, S16_BE, S24_3LE, S24_3BE, FLOAT_LE, FLOAT_BE |
| 34 | Sample rates : 8000 - 48000 Hz continously | 34 | Sample rates : 8000 - 48000 Hz continuously |
| 35 | 35 | ||
| 36 | Playback | 36 | Playback |
| 37 | -------- | 37 | -------- |
| @@ -39,7 +39,7 @@ For instance the playback devices are configured to have max. 4 | |||
| 39 | substreams performing hardware mixing. This could be changed to a | 39 | substreams performing hardware mixing. This could be changed to a |
| 40 | maximum of 24 substreams if wished. | 40 | maximum of 24 substreams if wished. |
| 41 | Mono files will be played on the left and right channel. Each channel | 41 | Mono files will be played on the left and right channel. Each channel |
| 42 | can be muted for each stream to use 8 analog/digital outputs seperately. | 42 | can be muted for each stream to use 8 analog/digital outputs separately. |
| 43 | 43 | ||
| 44 | Capture | 44 | Capture |
| 45 | ------- | 45 | ------- |
| @@ -97,4 +97,4 @@ COPYRIGHT | |||
| 97 | ========= | 97 | ========= |
| 98 | 98 | ||
| 99 | Copyright (c) 2003 Digigram SA <alsa@digigram.com> | 99 | Copyright (c) 2003 Digigram SA <alsa@digigram.com> |
| 100 | Distributalbe under GPL. | 100 | Distributable under GPL. |