summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2012-03-30 13:37:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-30 16:03:15 -0700
commit970e2486492aa1eb47a436a5a4c81e92558986a9 (patch)
tree5c321b58b536695b513f21b9b8d5431f0db88ac5 /drivers/tty
parent096015236df46c64be8b86e41fd4e28522e5f7e5 (diff)
downloadlinux-3.10-970e2486492aa1eb47a436a5a4c81e92558986a9.tar.gz
linux-3.10-970e2486492aa1eb47a436a5a4c81e92558986a9.tar.bz2
linux-3.10-970e2486492aa1eb47a436a5a4c81e92558986a9.zip
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 'drivers/tty')
-rw-r--r--drivers/tty/isicom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/isicom.c b/drivers/tty/isicom.c
index 794ecb40017..e1235accab7 100644
--- a/drivers/tty/isicom.c
+++ b/drivers/tty/isicom.c
@@ -102,7 +102,7 @@
* You can find the original tools for this direct from Multitech
* ftp://ftp.multitech.com/ISI-Cards/
*
- * Having installed the cards the module options (/etc/modprobe.conf)
+ * Having installed the cards the module options (/etc/modprobe.d/)
*
* options isicom io=card1,card2,card3,card4 irq=card1,card2,card3,card4
*