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/isdn | |
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/isdn')
-rw-r--r-- | Documentation/isdn/README.gigaset | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Documentation/isdn/README.gigaset b/Documentation/isdn/README.gigaset index ef3343eaa002..7534c6039adc 100644 --- a/Documentation/isdn/README.gigaset +++ b/Documentation/isdn/README.gigaset | |||
@@ -97,8 +97,7 @@ GigaSet 307x Device Driver | |||
97 | 2.5.): 1=on (default), 0=off | 97 | 2.5.): 1=on (default), 0=off |
98 | 98 | ||
99 | Depending on your distribution you may want to create a separate module | 99 | Depending on your distribution you may want to create a separate module |
100 | configuration file /etc/modprobe.d/gigaset for these, or add them to a | 100 | configuration file like /etc/modprobe.d/gigaset.conf for these. |
101 | custom file like /etc/modprobe.conf.local. | ||
102 | 101 | ||
103 | 2.2. Device nodes for user space programs | 102 | 2.2. Device nodes for user space programs |
104 | ------------------------------------ | 103 | ------------------------------------ |
@@ -212,8 +211,8 @@ GigaSet 307x Device Driver | |||
212 | 211 | ||
213 | options ppp_async flag_time=0 | 212 | options ppp_async flag_time=0 |
214 | 213 | ||
215 | to an appropriate module configuration file, like /etc/modprobe.d/gigaset | 214 | to an appropriate module configuration file, like |
216 | or /etc/modprobe.conf.local. | 215 | /etc/modprobe.d/gigaset.conf. |
217 | 216 | ||
218 | Unimodem mode is needed for making some devices [e.g. SX100] work which | 217 | Unimodem mode is needed for making some devices [e.g. SX100] work which |
219 | do not support the regular Gigaset command set. If debug output (see | 218 | do not support the regular Gigaset command set. If debug output (see |
@@ -237,8 +236,8 @@ GigaSet 307x Device Driver | |||
237 | modprobe usb_gigaset startmode=0 | 236 | modprobe usb_gigaset startmode=0 |
238 | or by adding a line like | 237 | or by adding a line like |
239 | options usb_gigaset startmode=0 | 238 | options usb_gigaset startmode=0 |
240 | to an appropriate module configuration file, like /etc/modprobe.d/gigaset | 239 | to an appropriate module configuration file, like |
241 | or /etc/modprobe.conf.local. | 240 | /etc/modprobe.d/gigaset.conf |
242 | 241 | ||
243 | 2.6. Call-ID (CID) mode | 242 | 2.6. Call-ID (CID) mode |
244 | ------------------ | 243 | ------------------ |
@@ -310,7 +309,7 @@ GigaSet 307x Device Driver | |||
310 | 309 | ||
311 | options isdn dialtimeout=15 | 310 | options isdn dialtimeout=15 |
312 | 311 | ||
313 | to /etc/modprobe.d/gigaset, /etc/modprobe.conf.local or a similar file. | 312 | to /etc/modprobe.d/gigaset.conf or a similar file. |
314 | 313 | ||
315 | Problem: | 314 | Problem: |
316 | The isdnlog program emits error messages or just doesn't work. | 315 | The isdnlog program emits error messages or just doesn't work. |
@@ -350,8 +349,7 @@ GigaSet 307x Device Driver | |||
350 | The initial value can be set using the debug parameter when loading the | 349 | The initial value can be set using the debug parameter when loading the |
351 | module "gigaset", e.g. by adding a line | 350 | module "gigaset", e.g. by adding a line |
352 | options gigaset debug=0 | 351 | options gigaset debug=0 |
353 | to your module configuration file, eg. /etc/modprobe.d/gigaset or | 352 | to your module configuration file, eg. /etc/modprobe.d/gigaset.conf |
354 | /etc/modprobe.conf.local. | ||
355 | 353 | ||
356 | Generated debugging information can be found | 354 | Generated debugging information can be found |
357 | - as output of the command | 355 | - as output of the command |