diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
| commit | f969d69ba9f952e5bdd38278e25e26a3e4a61a70 (patch) | |
| tree | b3530d803df59d726afaabebc6626987dee1ca05 /drivers/char/ip2 | |
| parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) | |
Merge with 2.3.27.
Diffstat (limited to 'drivers/char/ip2')
| -rw-r--r-- | drivers/char/ip2/ip2.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/char/ip2/ip2.h b/drivers/char/ip2/ip2.h index 7236744b0..4fc99c55c 100644 --- a/drivers/char/ip2/ip2.h +++ b/drivers/char/ip2/ip2.h @@ -70,8 +70,7 @@ * console warning. * When the driver is loaded as a module these setting can be overridden on the - * modprobe command line or on an option line in /etc/conf.modules - * or /etc/modules.conf depending on your distrubution. + * modprobe command line or on an option line in /etc/modules.conf. * If the driver is built-in the configuration must be * set here for ISA cards and address set to 1 and 2 for PCI and EISA. * @@ -92,8 +91,8 @@ /* this structure is zeroed out because the suggested method is to configure * the driver as a module, set up the parameters with an options line in - * /etc/modules.conf or /etc/conf.modules and load with modprobe, kerneld or - * kmod, the kernel module loader + * /etc/modules.conf and load with modprobe, kerneld or kmod, the kernel + * module loader */ static ip2config_t ip2config = { |