aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/sound/oss/Opti
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2012-03-30 16:37:16 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-30 19:03:15 -0400
commit970e2486492aa1eb47a436a5a4c81e92558986a9 (patch)
tree5c321b58b536695b513f21b9b8d5431f0db88ac5 /Documentation/sound/oss/Opti
parent096015236df46c64be8b86e41fd4e28522e5f7e5 (diff)
Documentation: remove references to /etc/modprobe.conf
Usage of /etc/modprobe.conf file was deprecated by module-init-tools and is no longer parsed by new kmod tool. References to this file are replaced in Documentation, comments and Kconfig according to the context. There are also some references to the old /etc/modules.conf from 2.4 kernels that are being removed. Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi> Acked-by: Takashi Iwai <tiwai@suse.de> Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/sound/oss/Opti')
-rw-r--r--Documentation/sound/oss/Opti8
1 files changed, 2 insertions, 6 deletions
diff --git a/Documentation/sound/oss/Opti b/Documentation/sound/oss/Opti
index c15af3c07d46..4cd5d9ab3580 100644
--- a/Documentation/sound/oss/Opti
+++ b/Documentation/sound/oss/Opti
@@ -18,7 +18,7 @@ force the card into a mode in which it can be programmed.
18If you have another OS installed on your computer it is recommended 18If you have another OS installed on your computer it is recommended
19that Linux and the other OS use the same resources. 19that Linux and the other OS use the same resources.
20 20
21Also, it is recommended that resources specified in /etc/modprobe.conf 21Also, it is recommended that resources specified in /etc/modprobe.d/*.conf
22and resources specified in /etc/isapnp.conf agree. 22and resources specified in /etc/isapnp.conf agree.
23 23
24Compiling the sound driver 24Compiling the sound driver
@@ -67,11 +67,7 @@ address is hard-coded into the driver.
67 67
68Using kmod and autoloading the sound driver 68Using kmod and autoloading the sound driver
69------------------------------------------- 69-------------------------------------------
70Comment: as of linux-2.1.90 kmod is replacing kerneld. 70Config files in '/etc/modprobe.d/' are used as below:
71The config file '/etc/modprobe.conf' is used as before.
72
73This is the sound part of my /etc/modprobe.conf file.
74Following that I will explain each line.
75 71
76alias mixer0 mad16 72alias mixer0 mad16
77alias audio0 mad16 73alias audio0 mad16