diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-11 18:59:04 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-11 18:59:04 -0500 |
| commit | 0526484aa345adbf790d1201a6f5d09be0a648a3 (patch) | |
| tree | 8da37ac2858a960e80dc59ebc4afc460935724f4 /Documentation/sound/alsa/ALSA-Configuration.txt | |
| parent | e0ea8b2c0677e6cc44a0e5b867be48867f91de5b (diff) | |
| parent | aa021baa3295fa6e3f367d80f8955dd5176656eb (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'Documentation/sound/alsa/ALSA-Configuration.txt')
| -rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 1c8eb4518ce0..fd9a2f67edf2 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
| @@ -522,7 +522,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 522 | pcm_devs - Number of PCM devices assigned to each card | 522 | pcm_devs - Number of PCM devices assigned to each card |
| 523 | (default = 1, up to 4) | 523 | (default = 1, up to 4) |
| 524 | pcm_substreams - Number of PCM substreams assigned to each PCM | 524 | pcm_substreams - Number of PCM substreams assigned to each PCM |
| 525 | (default = 8, up to 16) | 525 | (default = 8, up to 128) |
| 526 | hrtimer - Use hrtimer (=1, default) or system timer (=0) | 526 | hrtimer - Use hrtimer (=1, default) or system timer (=0) |
| 527 | fake_buffer - Fake buffer allocations (default = 1) | 527 | fake_buffer - Fake buffer allocations (default = 1) |
| 528 | 528 | ||