The patch titled parport: add to kernel-doc has been added to the -mm tree. Its filename is parport-add-to-kernel-doc.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: parport: add to kernel-doc From: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Add parport interfaces to kernel-doc template. Small doc. cleanups in 2 parport source files. Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- Documentation/DocBook/kernel-api.tmpl | 9 ++++++++- drivers/parport/daisy.c | 2 +- drivers/parport/share.c | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff -puN Documentation/DocBook/kernel-api.tmpl~parport-add-to-kernel-doc Documentation/DocBook/kernel-api.tmpl --- a/Documentation/DocBook/kernel-api.tmpl~parport-add-to-kernel-doc +++ a/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 -puN drivers/parport/daisy.c~parport-add-to-kernel-doc drivers/parport/daisy.c --- a/drivers/parport/daisy.c~parport-add-to-kernel-doc +++ a/drivers/parport/daisy.c @@ -283,7 +283,7 @@ void parport_close (struct pardevice *de * * 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 -puN drivers/parport/share.c~parport-add-to-kernel-doc drivers/parport/share.c --- a/drivers/parport/share.c~parport-add-to-kernel-doc +++ a/drivers/parport/share.c @@ -218,7 +218,7 @@ static void free_port (struct parport *p * 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. **/ _ Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are origin.patch git-dvb.patch git-kbuild.patch git-pcmcia.patch lpfc-sparse-null-warnings.patch aic7-cleanup-module_parm_desc-strings.patch qla1280-fix-section-mismatch-warnings.patch areca-raid-linux-scsi-driver.patch git-watchdog.patch slab-kmalloc-kzalloc-comments-cleanup-and-fix.patch kernel-doc-for-mm-filemapc.patch add-poisonh-and-patch-primary-users.patch update-2-drivers-for-poisonh.patch poison-add-use-more-constants.patch add-doc-submitchecklist.patch doc-add-audit-acct-to-docbook.patch codingstyle-add-typedefs-chapter.patch fix-listh-kernel-doc.patch listh-doc-change-counter-to-control.patch kernel-doc-drop-leading-space-in-sections.patch kernel-doc-script-cleanups.patch wd7000-fix-section-mismatch-warnings.patch megaraid_mbox-fix-section-mismatch-warnings.patch kernel-doc-mm-readhead-fixup.patch checkstack-pirnt-module-names.patch wan-sdla-section-fixes.patch trident-fb-section-fixes.patch cdrom-mcdx-section-fixes.patch char-ip2-more-section-fixes-replacement.patch advansys-section-fixes.patch kernel-doc-warn-on-malformed-function-docs.patch ide-floppy-fix-debug-only-syntax-error.patch kernel-doc-for-lib-bitmapc.patch kernel-doc-for-lib-cmdlinec.patch kernel-doc-for-lib-crcc.patch kernel-doc-dont-use-xml-escapes-in-text-or-man-output.patch kernel-doc-use-members-for-struct-fields-consistently.patch reed-solomon-fix-kernel-doc-comments.patch ktime-hrtimer-fix-kernel-doc-comments.patch dmi-cleanup-kernel-doc-add-to-docbook.patch kthread-move-kernel-doc-and-put-it-into-docbook.patch corrections-to-memory-barrier-doc.patch parport-add-to-kernel-doc.patch pi-futex-rt-mutex-docs-update.patch acpi-identify-which-device-is-not-power-manageable.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html