summaryrefslogtreecommitdiffstats
path: root/Documentation/parport.txt
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-04-05 04:55:58 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-04-05 04:55:58 +0000
commit74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch)
tree7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /Documentation/parport.txt
parentee6374c8b0d333c08061c6a97bc77090d7461225 (diff)
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to switch to another getty like getty_ps. This commit also includes a fix for a setitimer bug which did prevent getty_ps from working on older kernels.
Diffstat (limited to 'Documentation/parport.txt')
-rw-r--r--Documentation/parport.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/parport.txt b/Documentation/parport.txt
index 27c6d1c40..34adde395 100644
--- a/Documentation/parport.txt
+++ b/Documentation/parport.txt
@@ -19,12 +19,12 @@ Parport as modules
If you load the parport code as a module, say
- # insmod parport.o
+ # insmod parport
to load the generic parport code. You then must load the
architecture-dependent code with (for example):
- # insmod parport_pc.o io=0x3bc,0x378,0x278 irq=none,7,auto
+ # insmod parport_pc io=0x3bc,0x378,0x278 irq=none,7,auto
to tell the parport code that you want three PC-style ports, one at
0x3bc with no IRQ, one at 0x378 using IRQ 7, and one at 0x278 with an
@@ -192,7 +192,7 @@ is loaded it will create one lp device for each port found. You can
override this, though, by using parameters either when you load the lp
driver:
- # insmod lp.o parport=0,2
+ # insmod lp parport=0,2
or on the LILO command line: