aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-10 01:26:45 -0400
committerTakashi Iwai <tiwai@suse.de>2009-06-10 01:26:45 -0400
commit45d60e3648eaba1f5f6976df901fb7c45660fb49 (patch)
treefb468f9c69a650989590dd6b5c6563fc796403e9 /Documentation
parent87cb14a5f46207f5c445dd755096f8568d136a2a (diff)
parentb0ec3a30bc01c15cc6277b223fae136f7b71e90c (diff)
Merge branch 'topic/sc6000' into for-linus
* topic/sc6000: ALSA: sc6000: enable joystick port ALSA: sc6000: fix older card initialization ALSA: sc6000: add support for SC-6600 and SC-7000
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 096af12a0afa..5c08d96f407c 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1570,13 +1570,15 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
1570 Module snd-sc6000 1570 Module snd-sc6000
1571 ----------------- 1571 -----------------
1572 1572
1573 Module for Gallant SC-6000 soundcard. 1573 Module for Gallant SC-6000 soundcard and later models: SC-6600
1574 and SC-7000.
1574 1575
1575 port - Port # (0x220 or 0x240) 1576 port - Port # (0x220 or 0x240)
1576 mss_port - MSS Port # (0x530 or 0xe80) 1577 mss_port - MSS Port # (0x530 or 0xe80)
1577 irq - IRQ # (5,7,9,10,11) 1578 irq - IRQ # (5,7,9,10,11)
1578 mpu_irq - MPU-401 IRQ # (5,7,9,10) ,0 - no MPU-401 irq 1579 mpu_irq - MPU-401 IRQ # (5,7,9,10) ,0 - no MPU-401 irq
1579 dma - DMA # (1,3,0) 1580 dma - DMA # (1,3,0)
1581 joystick - Enable gameport - 0 = disable (default), 1 = enable
1580 1582
1581 This module supports multiple cards. 1583 This module supports multiple cards.
1582 1584