diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 23:36:16 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 23:36:16 (GMT) |
commit | 9fb5430c3d6e96a74fd4406dbe7608f36abb9987 (patch) | |
tree | 1c990d9f2f91f6daabbf2de957bea744dd2bcb71 /Documentation | |
parent | 4c5ecb7e59662a76754efdd41c6ed4415e6e9840 (diff) | |
parent | e5bf48437370f3fc603e2dce12e8d3fb1a6a2457 (diff) | |
download | linux-fsl-qoriq-9fb5430c3d6e96a74fd4406dbe7608f36abb9987.tar.xz |
Merge branch 'topic/oss-fix' into for-linus
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/sound/oss/CS4232 | 23 | ||||
-rw-r--r-- | Documentation/sound/oss/Introduction | 2 |
2 files changed, 1 insertions, 24 deletions
diff --git a/Documentation/sound/oss/CS4232 b/Documentation/sound/oss/CS4232 deleted file mode 100644 index 7d6af7a..0000000 --- a/Documentation/sound/oss/CS4232 +++ /dev/null @@ -1,23 +0,0 @@ -To configure the Crystal CS423x sound chip and activate its DSP functions, -modules may be loaded in this order: - - modprobe sound - insmod ad1848 - insmod uart401 - insmod cs4232 io=* irq=* dma=* dma2=* - -This is the meaning of the parameters: - - io--I/O address of the Windows Sound System (normally 0x534) - irq--IRQ of this device - dma and dma2--DMA channels (DMA2 may be 0) - -On some cards, the board attempts to do non-PnP setup, and fails. If you -have problems, use Linux' PnP facilities. - -To get MIDI facilities add - - insmod opl3 io=* - -where "io" is the I/O address of the OPL3 synthesizer. This will be shown -in /proc/sys/pnp and is normally 0x388. diff --git a/Documentation/sound/oss/Introduction b/Documentation/sound/oss/Introduction index f04ba6b..75d967f 100644 --- a/Documentation/sound/oss/Introduction +++ b/Documentation/sound/oss/Introduction @@ -80,7 +80,7 @@ Notes: additional features. 2. The commercial OSS driver may be obtained from the site: - http://www/opensound.com. This may be used for cards that + http://www.opensound.com. This may be used for cards that are unsupported by the kernel driver, or may be used by other operating systems. |