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>

2 files changed, 8 insertions, 8 deletions

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 7d48700257a7..9328121804bb 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -341,10 +341,10 @@ MODULE_PARM_DESC(aic79xx,
 "                               (0/256ms,1/128ms,2/64ms,3/32ms)\n"
 "       slowcrc                 Turn on the SLOWCRC bit (Rev B only)\n"          
 "\n"
-"       Sample /etc/modprobe.conf line:\n"
-"               Enable verbose logging\n"
-"               Set tag depth on Controller 2/Target 2 to 10 tags\n"
-"               Shorten the selection timeout to 128ms\n"
+"       Sample modprobe configuration file:\n"
+"       #       Enable verbose logging\n"
+"       #       Set tag depth on Controller 2/Target 2 to 10 tags\n"
+"       #       Shorten the selection timeout to 128ms\n"
 "\n"
 "       options aic79xx 'aic79xx=verbose.tag_info:{{}.{}.{..10}}.seltime:1'\n"
 );
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index c6251bb4f438..5a477cdc780d 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -360,10 +360,10 @@ MODULE_PARM_DESC(aic7xxx,
 "       seltime:<int>           Selection Timeout\n"
 "                               (0/256ms,1/128ms,2/64ms,3/32ms)\n"
 "\n"
-"       Sample /etc/modprobe.conf line:\n"
-"               Toggle EISA/VLB probing\n"
-"               Set tag depth on Controller 1/Target 1 to 10 tags\n"
-"               Shorten the selection timeout to 128ms\n"
+"       Sample modprobe configuration file:\n"
+"       #       Toggle EISA/VLB probing\n"
+"       #       Set tag depth on Controller 1/Target 1 to 10 tags\n"
+"       #       Shorten the selection timeout to 128ms\n"
 "\n"
 "       options aic7xxx 'aic7xxx=probe_eisa_vl.tag_info:{{}.{.10}}.seltime:1'\n"
 );