aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/sound/oss/Introduction
diff options
context:
space:
mode:
authorJonathan Herman <hermanjl@cs.unc.edu>2013-01-17 16:15:55 -0500
committerJonathan Herman <hermanjl@cs.unc.edu>2013-01-17 16:15:55 -0500
commit8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch)
treea8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /Documentation/sound/oss/Introduction
parent406089d01562f1e2bf9f089fd7637009ebaad589 (diff)
Patched in Tegra support.
Diffstat (limited to 'Documentation/sound/oss/Introduction')
-rw-r--r--Documentation/sound/oss/Introduction10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/sound/oss/Introduction b/Documentation/sound/oss/Introduction
index 42da2d8fa37..75d967ff926 100644
--- a/Documentation/sound/oss/Introduction
+++ b/Documentation/sound/oss/Introduction
@@ -167,8 +167,8 @@ in a file such as /root/soundon.sh.
167MODPROBE: 167MODPROBE:
168========= 168=========
169 169
170If loading via modprobe, these common files are automatically loaded when 170If loading via modprobe, these common files are automatically loaded
171requested by modprobe. For example, my /etc/modprobe.d/oss.conf contains: 171when requested by modprobe. For example, my /etc/modprobe.conf contains:
172 172
173alias sound sb 173alias sound sb
174options sb io=0x240 irq=9 dma=3 dma16=5 mpu_io=0x300 174options sb io=0x240 irq=9 dma=3 dma16=5 mpu_io=0x300
@@ -228,7 +228,7 @@ http://www.opensound.com. Before loading the commercial sound
228driver, you should do the following: 228driver, you should do the following:
229 229
2301. remove sound modules (detailed above) 2301. remove sound modules (detailed above)
2312. remove the sound modules from /etc/modprobe.d/*.conf 2312. remove the sound modules from /etc/modprobe.conf
2323. move the sound modules from /lib/modules/<kernel>/misc 2323. move the sound modules from /lib/modules/<kernel>/misc
233 (for example, I make a /lib/modules/<kernel>/misc/tmp 233 (for example, I make a /lib/modules/<kernel>/misc/tmp
234 directory and copy the sound module files to that 234 directory and copy the sound module files to that
@@ -265,7 +265,7 @@ twice, you need to do the following:
265 sb.o could be copied (or symlinked) to sb1.o for the 265 sb.o could be copied (or symlinked) to sb1.o for the
266 second SoundBlaster. 266 second SoundBlaster.
267 267
2682. Make a second entry in /etc/modprobe.d/*conf, for example, 2682. Make a second entry in /etc/modprobe.conf, for example,
269 sound1 or sb1. This second entry should refer to the 269 sound1 or sb1. This second entry should refer to the
270 new module names for example sb1, and should include 270 new module names for example sb1, and should include
271 the I/O, etc. for the second sound card. 271 the I/O, etc. for the second sound card.
@@ -369,7 +369,7 @@ There are several ways of configuring your sound:
3692) On the command line when using insmod or in a bash script 3692) On the command line when using insmod or in a bash script
370 using command line calls to load sound. 370 using command line calls to load sound.
371 371
3723) In /etc/modprobe.d/*conf when using modprobe. 3723) In /etc/modprobe.conf when using modprobe.
373 373
3744) Via Red Hat's GPL'd /usr/sbin/sndconfig program (text based). 3744) Via Red Hat's GPL'd /usr/sbin/sndconfig program (text based).
375 375