Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 970e2486 authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Linus Torvalds
Browse files

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: default avatarLucas De Marchi <lucas.demarchi@profusion.mobi>
Acked-by: default avatarTakashi Iwai <tiwai@suse.de>
Acked-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 09601523

Documentation/aoe/aoe.txt

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ CREATING DEVICE NODES 
    sh Documentation/aoe/mkshelf.sh /dev/etherd 0



  There is also an autoload script that shows how to edit

  /etc/modprobe.conf to ensure that the aoe module is loaded when

  /etc/modprobe.d/aoe.conf to ensure that the aoe module is loaded when

  necessary.



USING DEVICE NODES

Documentation/aoe/autoload.sh

+2 −2
Original line number Diff line number Diff line 
#!/bin/sh

# set aoe to autoload by installing the

# aliases in /etc/modprobe.conf

# aliases in /etc/modprobe.d/



f=/etc/modprobe.conf

f=/etc/modprobe.d/aoe.conf



if test ! -r $f || test ! -w $f; then

	echo "cannot configure $f for module autoloading" 1>&2

Documentation/blockdev/floppy.txt

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ you can put: 


 options floppy omnibook messages



in /etc/modprobe.conf.

in a configuration file in /etc/modprobe.d/.





 The floppy driver related options are:

Documentation/fb/intel810.txt

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ Using the same setup as described above, load the module like this: 
	modprobe i810fb vram=2 xres=1024 bpp=8 hsync1=30 hsync2=55 vsync1=50 \

	         vsync2=85 accel=1 mtrr=1



Or just add the following to /etc/modprobe.conf

Or just add the following to a configuration file in /etc/modprobe.d/



	options i810fb vram=2 xres=1024 bpp=16 hsync1=30 hsync2=55 vsync1=50 \

	vsync2=85 accel=1 mtrr=1

Documentation/fb/intelfb.txt

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ Using the same setup as described above, load the module like this: 


	modprobe intelfb mode=800x600-32@75 vram=8 accel=1 hwcursor=1



Or just add the following to /etc/modprobe.conf

Or just add the following to a configuration file in /etc/modprobe.d/



	options intelfb mode=800x600-32@75 vram=8 accel=1 hwcursor=1