From e6db9d87e536f654b889707f2aae84ece5eb25e3 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Sun, 25 Jun 2006 05:49:29 -0700
Subject: [PATCH] --- yaml --- r: 29825 b: refs/heads/master c:
 7d469722779c9fe0b415163e8fe837440f9c70dc h: refs/heads/master i:   29823:
 99aa9cc19d6f59f0c9a84b021f71cb8861da64ae v: v3

---
 [refs]                                      | 2 +-
 trunk/Documentation/DocBook/kernel-api.tmpl | 9 ++++++++-
 trunk/drivers/parport/daisy.c               | 2 +-
 trunk/drivers/parport/share.c               | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 81ca60fda73e..f864d4222982 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e37ed37b1a70a65185736fbec543ca4ad64a673
+refs/heads/master: 7d469722779c9fe0b415163e8fe837440f9c70dc
diff --git a/trunk/Documentation/DocBook/kernel-api.tmpl b/trunk/Documentation/DocBook/kernel-api.tmpl
index 8305eb7b8c15..3630a0d7695f 100644
--- a/trunk/Documentation/DocBook/kernel-api.tmpl
+++ b/trunk/Documentation/DocBook/kernel-api.tmpl
@@ -436,7 +436,6 @@ X!Edrivers/pnp/system.c
      </sect1>
   </chapter>
 
-
   <chapter id="blkdev">
      <title>Block Devices</title>
 !Eblock/ll_rw_blk.c
@@ -447,6 +446,14 @@ X!Edrivers/pnp/system.c
 !Edrivers/char/misc.c
   </chapter>
 
+  <chapter id="parportdev">
+     <title>Parallel Port Devices</title>
+!Iinclude/linux/parport.h
+!Edrivers/parport/ieee1284.c
+!Edrivers/parport/share.c
+!Idrivers/parport/daisy.c
+  </chapter>
+
   <chapter id="viddev">
      <title>Video4Linux</title>
 !Edrivers/media/video/videodev.c
diff --git a/trunk/drivers/parport/daisy.c b/trunk/drivers/parport/daisy.c
index 9ee67321b630..fd41e28101ea 100644
--- a/trunk/drivers/parport/daisy.c
+++ b/trunk/drivers/parport/daisy.c
@@ -283,7 +283,7 @@ void parport_close (struct pardevice *dev)
  *
  *	This tries to locate a device on the given parallel port,
  *	multiplexor port and daisy chain address, and returns its
- *	device number or -NXIO if no device with those coordinates
+ *	device number or %-ENXIO if no device with those coordinates
  *	exists.
  **/
 
diff --git a/trunk/drivers/parport/share.c b/trunk/drivers/parport/share.c
index bbbfd79adbaf..2cb22c8d3357 100644
--- a/trunk/drivers/parport/share.c
+++ b/trunk/drivers/parport/share.c
@@ -218,7 +218,7 @@ static void free_port (struct parport *port)
  *	parport_get_port - increment a port's reference count
  *	@port: the port
  *
- *	This ensure's that a struct parport pointer remains valid
+ *	This ensures that a struct parport pointer remains valid
  *	until the matching parport_put_port() call.
  **/