diff options
| author | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2012-03-30 13:37:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 16:03:15 -0700 |
| commit | 970e2486492aa1eb47a436a5a4c81e92558986a9 (patch) | |
| tree | 5c321b58b536695b513f21b9b8d5431f0db88ac5 /Documentation/networking/ipv6.txt | |
| parent | 096015236df46c64be8b86e41fd4e28522e5f7e5 (diff) | |
| download | lwn-970e2486492aa1eb47a436a5a4c81e92558986a9.tar.gz lwn-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/networking/ipv6.txt')
| -rw-r--r-- | Documentation/networking/ipv6.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/networking/ipv6.txt b/Documentation/networking/ipv6.txt index 9fd7e21296c8..6cd74fa55358 100644 --- a/Documentation/networking/ipv6.txt +++ b/Documentation/networking/ipv6.txt @@ -2,9 +2,9 @@ Options for the ipv6 module are supplied as parameters at load time. Module options may be given as command line arguments to the insmod -or modprobe command, but are usually specified in either the -/etc/modules.conf or /etc/modprobe.conf configuration file, or in a -distro-specific configuration file. +or modprobe command, but are usually specified in either +/etc/modules.d/*.conf configuration files, or in a distro-specific +configuration file. The available ipv6 module parameters are listed below. If a parameter is not specified the default value is used. |