diff options
| author | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2012-03-30 16:37:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 19:03:15 -0400 |
| commit | 970e2486492aa1eb47a436a5a4c81e92558986a9 (patch) | |
| tree | 5c321b58b536695b513f21b9b8d5431f0db88ac5 /Documentation/video4linux/bttv | |
| parent | 096015236df46c64be8b86e41fd4e28522e5f7e5 (diff) | |
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/video4linux/bttv')
| -rw-r--r-- | Documentation/video4linux/bttv/Modules.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/video4linux/bttv/Modules.conf b/Documentation/video4linux/bttv/Modules.conf index 753f15956eb8..8f258faf18f1 100644 --- a/Documentation/video4linux/bttv/Modules.conf +++ b/Documentation/video4linux/bttv/Modules.conf | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # For modern kernels (2.6 or above), this belongs in /etc/modprobe.conf | 1 | # For modern kernels (2.6 or above), this belongs in /etc/modprobe.d/*.conf |
| 2 | # For for 2.4 kernels or earlier, this belongs in /etc/modules.conf. | 2 | # For for 2.4 kernels or earlier, this belongs in /etc/modules.conf. |
| 3 | 3 | ||
| 4 | # i2c | 4 | # i2c |