Merge with 2.3.27.

8 files changed, 15 insertions, 15 deletions

diff --git a/Documentation/sound/AWE32 b/Documentation/sound/AWE32
index edc0b880e..a0f18d640 100644
--- a/Documentation/sound/AWE32
+++ b/Documentation/sound/AWE32
@@ -83,7 +83,7 @@ Compile it. Copy sfxload program to /usr/bin. To enable AWE general midi
 synthesis you should also get the sound bank file for general midi from
 http://members.xoom.com/yar/synthgm.sbk.gz. Copy it to /usr and gunzip it there.
 
-7) Edit /etc/conf.modules, inserting at the end of the file:
+7) Edit /etc/modules.conf, inserting at the end of the file:
 
 alias midi awe_wave
 post-install awe_wave /usr/bin/sfxload /usr/synthfm.sbk
diff --git a/Documentation/sound/AudioExcelDSP16 b/Documentation/sound/AudioExcelDSP16
index 855ee59de..f4ffd9d0c 100644
--- a/Documentation/sound/AudioExcelDSP16
+++ b/Documentation/sound/AudioExcelDSP16
@@ -41,7 +41,7 @@ mpu_base	I/O base address for activate MPU-401 mode
 		(0x300, 0x310, 0x320 or 0x330)
 mpu_irq		MPU-401 irq line (5, 7, 9, 10 or 0)
 
-The /etc/conf.modules will have lines like this:
+The /etc/modules.conf will have lines like this:
 
 options opl3 io=0x388
 options ad1848 io=0x530 irq=11 dma=3
@@ -51,7 +51,7 @@ Where the aedsp16 options are the options for this driver while opl3 and
 ad1848 are the corresponding options for the MSS and OPL3 modules.
 
 Loading MSS and OPL3 needs to pre load the aedsp16 module to set up correctly
-the sound card. Installation dependencies must be written in the conf.modules
+the sound card. Installation dependencies must be written in the modules.conf
 file:
 
 pre-install ad1848 modprobe aedsp16
diff --git a/Documentation/sound/CMI8330 b/Documentation/sound/CMI8330
index fca15f606..a12bed1d2 100644
--- a/Documentation/sound/CMI8330
+++ b/Documentation/sound/CMI8330
@@ -88,7 +88,7 @@ CONFIG_SOUND_MSS=m
 
 
 
-Alma Chao <elysian@ethereal.torsion.org> suggests the following /etc/conf.modules:
+Alma Chao <elysian@ethereal.torsion.org> suggests the following /etc/modules.conf:
 
 alias sound ad1848
 alias synth0 opl3
diff --git a/Documentation/sound/Introduction b/Documentation/sound/Introduction
index f33121e0c..0e9bbc865 100644
--- a/Documentation/sound/Introduction
+++ b/Documentation/sound/Introduction
@@ -145,7 +145,7 @@ MODPROBE:
 =========
 
 If loading via modprobe, these common files are automatically loaded 
-when requested by modprobe.  For example, my /etc/conf.modules contains:
+when requested by modprobe.  For example, my /etc/modules.conf contains:
 
 alias sound sb 
 options sb io=0x240 irq=9 dma=3 dma16=5 mpu_io=0x300
@@ -205,7 +205,7 @@ http://www.opensound.com.  Before loading the commercial sound
 driver, you should do the following:
 
 1.  remove sound modules (detailed above)
-2.  remove the sound modules from /etc/conf.modules
+2.  remove the sound modules from /etc/modules.conf
 3.  move the sound modules from /lib/modules/<kernel>/misc
     (for example, I make a /lib/modules/<kernel>/misc/tmp
     directory and copy the sound module files to that 
@@ -241,7 +241,7 @@ twice, you need to do the following:
     sb.o could be copied (or symlinked) to sb1.o for the
     second SoundBlasster.
 
-2.  Make a second entry in /etc/conf.modules, for example,
+2.  Make a second entry in /etc/modules.conf, for example,
     sound1 or sb1.  This second entry should refer to the
     new module names for example sb1, and should include
     the I/O, etc. for the second sound card.
@@ -333,7 +333,7 @@ There are several ways of configuring your sound:
 2)  On the command line when using insmod or in a bash script
     using command line calls to load sound.
 
-3)  In /etc/conf.modules when using modprobe.
+3)  In /etc/modules.conf when using modprobe.
 
 4)  Via Red Hat's /usr/sbin/sndconfig program (text based).
 
diff --git a/Documentation/sound/OPL3-SA2 b/Documentation/sound/OPL3-SA2
index a51a4aebb..e6bca7089 100644
--- a/Documentation/sound/OPL3-SA2
+++ b/Documentation/sound/OPL3-SA2
@@ -125,7 +125,7 @@ and I'll try my best to help.
 
 Lastly, if you're using modules and want to set up automatic module
 loading with kmod, the kernel module loader, here is the section I
-currently use in my conf.modules file:
+currently use in my modules.conf file:
 
 # Sound
 alias char-major-14 opl3sa2
diff --git a/Documentation/sound/Opti b/Documentation/sound/Opti
index 34b0f4331..07318d243 100644
--- a/Documentation/sound/Opti
+++ b/Documentation/sound/Opti
@@ -18,7 +18,7 @@ force the card into a mode in which it can be programmed.
 If you have another OS installed on your computer it is recommended
 that Linux and the other OS use the same resources.
 
-Also, it is recommended that resources specified in /etc/conf.modules
+Also, it is recommended that resources specified in /etc/modules.conf
 and resources specified in /etc/isapnp.conf agree.
 
 Compiling the sound driver
@@ -68,9 +68,9 @@ address is hard-coded into the driver.
 Using kmod and autoloading the sound driver
 -------------------------------------------
 Comment: as of linux-2.1.90 kmod is replacing kerneld.
-The config file '/etc/conf.modules' is used as before.
+The config file '/etc/modules.conf' is used as before.
 
-This is the sound part of my /etc/conf.modules file.
+This is the sound part of my /etc/modules.conf file.
 Following that I will explain each line.
 
 alias mixer0 mad16
diff --git a/Documentation/sound/README.modules b/Documentation/sound/README.modules
index 91d044586..9cc30a3ac 100644
--- a/Documentation/sound/README.modules
+++ b/Documentation/sound/README.modules
@@ -26,7 +26,7 @@ Note that it is no longer necessary or possible to configure sound in the
 drivers/sound dir. Now one simply configures and makes one's kernel and
 modules in the usual way.
 
- Then, add to your /etc/modules.conf or /etc/conf.modules something like:
+ Then, add to your /etc/modules.conf something like:
 
 alias char-major-14 sb
 post-install sb /sbin/modprobe "-k" "adlib_card"
@@ -82,7 +82,7 @@ wasteful of RAM, but it guarantees that sound always works.
 
 To make the sound driver use persistent DMA buffers we need to pass the
 sound.o module a "dmabuf=1" command-line argument. This is normally done
-in /etc/conf.modules (or the more proper /etc/modules.conf) like so:
+in /etc/modules.conf like so:
 
 options sound		dmabuf=1
 
diff --git a/Documentation/sound/Wavefront b/Documentation/sound/Wavefront
index 66501a566..f1dcf975f 100644
--- a/Documentation/sound/Wavefront
+++ b/Documentation/sound/Wavefront
@@ -190,7 +190,7 @@ Here's my autoconf.h SOUND section:
 6) How do I configure my card ?
 ************************************************************
 
-You need to edit /etc/conf.modules. Here's mine (edited to show the
+You need to edit /etc/modules.conf. Here's mine (edited to show the
 relevant details):
 
   # Sound system