aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/serial/computone.txt
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2012-03-30 16:37:16 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-30 19:03:15 -0400
commit970e2486492aa1eb47a436a5a4c81e92558986a9 (patch)
tree5c321b58b536695b513f21b9b8d5431f0db88ac5 /Documentation/serial/computone.txt
parent096015236df46c64be8b86e41fd4e28522e5f7e5 (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/serial/computone.txt')
-rw-r--r--Documentation/serial/computone.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/serial/computone.txt b/Documentation/serial/computone.txt
index 39ddcdbeeb85..a6a1158ea2ba 100644
--- a/Documentation/serial/computone.txt
+++ b/Documentation/serial/computone.txt
@@ -49,7 +49,7 @@ Hardware - If you have an ISA card, find a free interrupt and io port.
49 49
50 Note the hardware address from the Computone ISA cards installed into 50 Note the hardware address from the Computone ISA cards installed into
51 the system. These are required for editing ip2.c or editing 51 the system. These are required for editing ip2.c or editing
52 /etc/modprobe.conf, or for specification on the modprobe 52 /etc/modprobe.d/*.conf, or for specification on the modprobe
53 command line. 53 command line.
54 54
55 Note that the /etc/modules.conf should be used for older (pre-2.6) 55 Note that the /etc/modules.conf should be used for older (pre-2.6)
@@ -66,7 +66,7 @@ b) Run "make config" or "make menuconfig" or "make xconfig"
66c) Set address on ISA cards then: 66c) Set address on ISA cards then:
67 edit /usr/src/linux/drivers/char/ip2.c if needed 67 edit /usr/src/linux/drivers/char/ip2.c if needed
68 or 68 or
69 edit /etc/modprobe.conf if needed (module). 69 edit config file in /etc/modprobe.d/ if needed (module).
70 or both to match this setting. 70 or both to match this setting.
71d) Run "make modules" 71d) Run "make modules"
72e) Run "make modules_install" 72e) Run "make modules_install"
@@ -153,11 +153,11 @@ the irqs are not specified the driver uses the default in ip2.c (which
153selects polled mode). If no base addresses are specified the defaults in 153selects polled mode). If no base addresses are specified the defaults in
154ip2.c are used. If you are autoloading the driver module with kerneld or 154ip2.c are used. If you are autoloading the driver module with kerneld or
155kmod the base addresses and interrupt number must also be set in ip2.c 155kmod the base addresses and interrupt number must also be set in ip2.c
156and recompile or just insert and options line in /etc/modprobe.conf or both. 156and recompile or just insert and options line in /etc/modprobe.d/*.conf or both.
157The options line is equivalent to the command line and takes precedence over 157The options line is equivalent to the command line and takes precedence over
158what is in ip2.c. 158what is in ip2.c.
159 159
160/etc/modprobe.conf sample: 160config sample to put /etc/modprobe.d/*.conf:
161 options ip2 io=1,0x328 irq=1,10 161 options ip2 io=1,0x328 irq=1,10
162 alias char-major-71 ip2 162 alias char-major-71 ip2
163 alias char-major-72 ip2 163 alias char-major-72 ip2