diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-14 12:01:56 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-14 12:01:56 -0500 |
| commit | b89371621e5bedc84498ced2c5c33976bd1b2f64 (patch) | |
| tree | b309919239586e25617a17785b827577b1abb6b5 /sound/pci/emu10k1/emu10k1x.c | |
| parent | 63978ab3e3e963db28093b53bb4598f2702e1ad7 (diff) | |
| parent | 74c2b45b714e49b427584b4bd8f44f1a24d82d9c (diff) | |
Merge branch 'next/isa' into topic/misc
Diffstat (limited to 'sound/pci/emu10k1/emu10k1x.c')
| -rw-r--r-- | sound/pci/emu10k1/emu10k1x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index 6b8ae7b5cd54..1d369ff73805 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c | |||
| @@ -184,7 +184,7 @@ MODULE_PARM_DESC(enable, "Enable the EMU10K1X soundcard."); | |||
| 184 | * The hardware has 3 channels for playback and 1 for capture. | 184 | * The hardware has 3 channels for playback and 1 for capture. |
| 185 | * - channel 0 is the front channel | 185 | * - channel 0 is the front channel |
| 186 | * - channel 1 is the rear channel | 186 | * - channel 1 is the rear channel |
| 187 | * - channel 2 is the center/lfe chanel | 187 | * - channel 2 is the center/lfe channel |
| 188 | * Volume is controlled by the AC97 for the front and rear channels by | 188 | * Volume is controlled by the AC97 for the front and rear channels by |
| 189 | * the PCM Playback Volume, Sigmatel Surround Playback Volume and | 189 | * the PCM Playback Volume, Sigmatel Surround Playback Volume and |
| 190 | * Surround Playback Volume. The Sigmatel 4-Speaker Stereo switch affects | 190 | * Surround Playback Volume. The Sigmatel 4-Speaker Stereo switch affects |