diff options
author | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2012-03-30 22:37:16 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-31 01:03:15 +0200 |
commit | 970e2486492aa1eb47a436a5a4c81e92558986a9 (patch) | |
tree | 5c321b58b536695b513f21b9b8d5431f0db88ac5 /Documentation/ide | |
parent | Documentation: input.txt: clarify mousedev 'cat' command syntax (diff) | |
download | linux-970e2486492aa1eb47a436a5a4c81e92558986a9.tar.xz linux-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 'Documentation/ide')
-rw-r--r-- | Documentation/ide/ide.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/ide/ide.txt b/Documentation/ide/ide.txt index e77bebfa7b0d..7aca987c23d9 100644 --- a/Documentation/ide/ide.txt +++ b/Documentation/ide/ide.txt @@ -169,7 +169,7 @@ When using ide.c as a module in combination with kmod, add: alias block-major-3 ide-probe -to /etc/modprobe.conf. +to a configuration file in /etc/modprobe.d/. When ide.c is used as a module, you can pass command line parameters to the driver using the "options=" keyword to insmod, while replacing any ',' with |