diff options
Diffstat (limited to 'Documentation/serial')
-rw-r--r-- | Documentation/serial/computone.txt | 8 | ||||
-rw-r--r-- | Documentation/serial/rocket.txt | 2 | ||||
-rw-r--r-- | Documentation/serial/stallion.txt | 4 |
3 files changed, 7 insertions, 7 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" | |||
66 | c) Set address on ISA cards then: | 66 | c) 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. |
71 | d) Run "make modules" | 71 | d) Run "make modules" |
72 | e) Run "make modules_install" | 72 | e) Run "make modules_install" |
@@ -153,11 +153,11 @@ the irqs are not specified the driver uses the default in ip2.c (which | |||
153 | selects polled mode). If no base addresses are specified the defaults in | 153 | selects polled mode). If no base addresses are specified the defaults in |
154 | ip2.c are used. If you are autoloading the driver module with kerneld or | 154 | ip2.c are used. If you are autoloading the driver module with kerneld or |
155 | kmod the base addresses and interrupt number must also be set in ip2.c | 155 | kmod the base addresses and interrupt number must also be set in ip2.c |
156 | and recompile or just insert and options line in /etc/modprobe.conf or both. | 156 | and recompile or just insert and options line in /etc/modprobe.d/*.conf or both. |
157 | The options line is equivalent to the command line and takes precedence over | 157 | The options line is equivalent to the command line and takes precedence over |
158 | what is in ip2.c. | 158 | what is in ip2.c. |
159 | 159 | ||
160 | /etc/modprobe.conf sample: | 160 | config 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 |
diff --git a/Documentation/serial/rocket.txt b/Documentation/serial/rocket.txt index 1d8582990435..60b039891057 100644 --- a/Documentation/serial/rocket.txt +++ b/Documentation/serial/rocket.txt | |||
@@ -62,7 +62,7 @@ in the system log at /var/log/messages. | |||
62 | 62 | ||
63 | If installed as a module, the module must be loaded. This can be done | 63 | If installed as a module, the module must be loaded. This can be done |
64 | manually by entering "modprobe rocket". To have the module loaded automatically | 64 | manually by entering "modprobe rocket". To have the module loaded automatically |
65 | upon system boot, edit the /etc/modprobe.conf file and add the line | 65 | upon system boot, edit a /etc/modprobe.d/*.conf file and add the line |
66 | "alias char-major-46 rocket". | 66 | "alias char-major-46 rocket". |
67 | 67 | ||
68 | In order to use the ports, their device names (nodes) must be created with mknod. | 68 | In order to use the ports, their device names (nodes) must be created with mknod. |
diff --git a/Documentation/serial/stallion.txt b/Documentation/serial/stallion.txt index 5c4902d9a5be..55090914a9c5 100644 --- a/Documentation/serial/stallion.txt +++ b/Documentation/serial/stallion.txt | |||
@@ -139,8 +139,8 @@ secondary address 0x280 and IRQ 10. | |||
139 | 139 | ||
140 | You will probably want to enter this module load and configuration information | 140 | You will probably want to enter this module load and configuration information |
141 | into your system startup scripts so that the drivers are loaded and configured | 141 | into your system startup scripts so that the drivers are loaded and configured |
142 | on each system boot. Typically the start up script would be something like | 142 | on each system boot. Typically configuration files are put in the |
143 | /etc/modprobe.conf. | 143 | /etc/modprobe.d/ directory. |
144 | 144 | ||
145 | 145 | ||
146 | 2.2 STATIC DRIVER CONFIGURATION: | 146 | 2.2 STATIC DRIVER CONFIGURATION: |