aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2006-06-25 08:49:29 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 13:01:25 -0400
commit7d469722779c9fe0b415163e8fe837440f9c70dc (patch)
treee129864b897bced5ff55111856ae006749c6e15f
parent5e37ed37b1a70a65185736fbec543ca4ad64a673 (diff)
[PATCH] parport: add to kernel-doc
Add parport interfaces to kernel-doc template. Small doc. cleanups in 2 parport source files. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--Documentation/DocBook/kernel-api.tmpl9
-rw-r--r--drivers/parport/daisy.c2
-rw-r--r--drivers/parport/share.c2
3 files changed, 10 insertions, 3 deletions
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index 8305eb7b8c15..3630a0d7695f 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -436,7 +436,6 @@ X!Edrivers/pnp/system.c
436 </sect1> 436 </sect1>
437 </chapter> 437 </chapter>
438 438
439
440 <chapter id="blkdev"> 439 <chapter id="blkdev">
441 <title>Block Devices</title> 440 <title>Block Devices</title>
442!Eblock/ll_rw_blk.c 441!Eblock/ll_rw_blk.c
@@ -447,6 +446,14 @@ X!Edrivers/pnp/system.c
447!Edrivers/char/misc.c 446!Edrivers/char/misc.c
448 </chapter> 447 </chapter>
449 448
449 <chapter id="parportdev">
450 <title>Parallel Port Devices</title>
451!Iinclude/linux/parport.h
452!Edrivers/parport/ieee1284.c
453!Edrivers/parport/share.c
454!Idrivers/parport/daisy.c
455 </chapter>
456
450 <chapter id="viddev"> 457 <chapter id="viddev">
451 <title>Video4Linux</title> 458 <title>Video4Linux</title>
452!Edrivers/media/video/videodev.c 459!Edrivers/media/video/videodev.c
diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c
index 9ee67321b630..fd41e28101ea 100644
--- a/drivers/parport/daisy.c
+++ b/drivers/parport/daisy.c
@@ -283,7 +283,7 @@ void parport_close (struct pardevice *dev)
283 * 283 *
284 * This tries to locate a device on the given parallel port, 284 * This tries to locate a device on the given parallel port,
285 * multiplexor port and daisy chain address, and returns its 285 * multiplexor port and daisy chain address, and returns its
286 * device number or -NXIO if no device with those coordinates 286 * device number or %-ENXIO if no device with those coordinates
287 * exists. 287 * exists.
288 **/ 288 **/
289 289
diff --git a/drivers/parport/share.c b/drivers/parport/share.c
index bbbfd79adbaf..2cb22c8d3357 100644
--- a/drivers/parport/share.c
+++ b/drivers/parport/share.c
@@ -218,7 +218,7 @@ static void free_port (struct parport *port)
218 * parport_get_port - increment a port's reference count 218 * parport_get_port - increment a port's reference count
219 * @port: the port 219 * @port: the port
220 * 220 *
221 * This ensure's that a struct parport pointer remains valid 221 * This ensures that a struct parport pointer remains valid
222 * until the matching parport_put_port() call. 222 * until the matching parport_put_port() call.
223 **/ 223 **/
224 224