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/laptops | |
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/laptops')
-rw-r--r-- | Documentation/laptops/sonypi.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/laptops/sonypi.txt b/Documentation/laptops/sonypi.txt index 4857acfc50f1..606bdb9ce036 100644 --- a/Documentation/laptops/sonypi.txt +++ b/Documentation/laptops/sonypi.txt | |||
@@ -110,7 +110,7 @@ Module use: | |||
110 | ----------- | 110 | ----------- |
111 | 111 | ||
112 | In order to automatically load the sonypi module on use, you can put those | 112 | In order to automatically load the sonypi module on use, you can put those |
113 | lines in your /etc/modprobe.conf file: | 113 | lines a configuration file in /etc/modprobe.d/: |
114 | 114 | ||
115 | alias char-major-10-250 sonypi | 115 | alias char-major-10-250 sonypi |
116 | options sonypi minor=250 | 116 | options sonypi minor=250 |