summaryrefslogtreecommitdiffstats
path: root/Documentation/parport.txt
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
commitd6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch)
treee2be02f33984c48ec019c654051d27964e42c441 /Documentation/parport.txt
parent609d1e803baf519487233b765eb487f9ec227a18 (diff)
Merge with 2.3.19.
Diffstat (limited to 'Documentation/parport.txt')
-rw-r--r--Documentation/parport.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/parport.txt b/Documentation/parport.txt
index 854290f15..152e3f3cf 100644
--- a/Documentation/parport.txt
+++ b/Documentation/parport.txt
@@ -139,8 +139,7 @@ spintime The number of microseconds to busy-loop while waiting
peripherals. This is a port-wide setting, i.e. it
applies to all devices on a particular port.
-timeslice The number of jiffies (FIXME: this should be in
- milliseconds or something) that a device driver is
+timeslice The number of miliseconds that a device driver is
allowed to keep a port claimed for. This is advisory,
and driver can ignore it if it must.