diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-01 09:58:10 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-01 09:58:10 -0500 |
commit | 75639e7ee1401b3876c7a00ffe96ea8027668690 (patch) | |
tree | 3d6813cd3fe0d974e0a40237d003a22c5f7438dd /Documentation | |
parent | 7584af10cf46e0f4aa1696f1be79fa0f19a945ba (diff) | |
parent | ad1cd745060ae2f24026b3b3d09da3426df6ab36 (diff) |
Merge branch 'topic/beep-rename' into topic/core-change
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 10 | ||||
-rw-r--r-- | Documentation/sound/alsa/ControlNames.txt | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index fd9a2f67edf2..50a59860ceed 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
@@ -1454,6 +1454,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
1454 | 1454 | ||
1455 | Module for internal PC-Speaker. | 1455 | Module for internal PC-Speaker. |
1456 | 1456 | ||
1457 | nopcm - Disable PC-Speaker PCM sound. Only beeps remain. | ||
1457 | nforce_wa - enable NForce chipset workaround. Expect bad sound. | 1458 | nforce_wa - enable NForce chipset workaround. Expect bad sound. |
1458 | 1459 | ||
1459 | This module supports system beeps, some kind of PCM playback and | 1460 | This module supports system beeps, some kind of PCM playback and |
@@ -1631,7 +1632,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
1631 | Module snd-sscape | 1632 | Module snd-sscape |
1632 | ----------------- | 1633 | ----------------- |
1633 | 1634 | ||
1634 | Module for ENSONIQ SoundScape PnP cards. | 1635 | Module for ENSONIQ SoundScape cards. |
1635 | 1636 | ||
1636 | port - Port # (PnP setup) | 1637 | port - Port # (PnP setup) |
1637 | wss_port - WSS Port # (PnP setup) | 1638 | wss_port - WSS Port # (PnP setup) |
@@ -1639,10 +1640,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
1639 | mpu_irq - MPU-401 IRQ # (PnP setup) | 1640 | mpu_irq - MPU-401 IRQ # (PnP setup) |
1640 | dma - DMA # (PnP setup) | 1641 | dma - DMA # (PnP setup) |
1641 | dma2 - 2nd DMA # (PnP setup, -1 to disable) | 1642 | dma2 - 2nd DMA # (PnP setup, -1 to disable) |
1643 | joystick - Enable gameport - 0 = disable (default), 1 = enable | ||
1644 | |||
1645 | This module supports multiple cards. | ||
1642 | 1646 | ||
1643 | This module supports multiple cards. ISA PnP must be enabled. | 1647 | The driver requires the firmware loader support on kernel. |
1644 | You need sscape_ctl tool in alsa-tools package for loading | ||
1645 | the microcode. | ||
1646 | 1648 | ||
1647 | Module snd-sun-amd7930 (on sparc only) | 1649 | Module snd-sun-amd7930 (on sparc only) |
1648 | -------------------------------------- | 1650 | -------------------------------------- |
diff --git a/Documentation/sound/alsa/ControlNames.txt b/Documentation/sound/alsa/ControlNames.txt index 5b18298e9495..fea65bb6269e 100644 --- a/Documentation/sound/alsa/ControlNames.txt +++ b/Documentation/sound/alsa/ControlNames.txt | |||
@@ -18,8 +18,9 @@ SOURCE: | |||
18 | Master | 18 | Master |
19 | Master Mono | 19 | Master Mono |
20 | Hardware Master | 20 | Hardware Master |
21 | Speaker (internal speaker) | ||
21 | Headphone | 22 | Headphone |
22 | PC Speaker | 23 | Beep (beep generator) |
23 | Phone | 24 | Phone |
24 | Phone Input | 25 | Phone Input |
25 | Phone Output | 26 | Phone Output |