The patch titled v4l: fix kernel-doc warning, function name, and docbook filename has been removed from the -mm tree. Its filename was v4l-fix-kernel-doc-warning-function-name-and-docbook-filename.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: v4l: fix kernel-doc warning, function name, and docbook filename From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Change function name in kernel-doc and add kernel-doc for parameter @index: Warning(linhead//drivers/media/video/videodev.c:2090): No description found for parameter 'index' Also change source file name in DocBook/videobook.tmpl to match the new source file name. Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/DocBook/videobook.tmpl | 2 +- drivers/media/video/v4l2-dev.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff -puN Documentation/DocBook/videobook.tmpl~v4l-fix-kernel-doc-warning-function-name-and-docbook-filename Documentation/DocBook/videobook.tmpl --- a/Documentation/DocBook/videobook.tmpl~v4l-fix-kernel-doc-warning-function-name-and-docbook-filename +++ a/Documentation/DocBook/videobook.tmpl @@ -1648,7 +1648,7 @@ static struct video_buffer capture_fb; <chapter id="pubfunctions"> <title>Public Functions Provided</title> -!Edrivers/media/video/videodev.c +!Edrivers/media/video/v4l2-dev.c </chapter> </book> diff -puN drivers/media/video/v4l2-dev.c~v4l-fix-kernel-doc-warning-function-name-and-docbook-filename drivers/media/video/v4l2-dev.c --- a/drivers/media/video/v4l2-dev.c~v4l-fix-kernel-doc-warning-function-name-and-docbook-filename +++ a/drivers/media/video/v4l2-dev.c @@ -222,11 +222,13 @@ int video_register_device(struct video_d EXPORT_SYMBOL(video_register_device); /** - * video_register_device - register video4linux devices + * video_register_device_index - register video4linux devices * @vfd: video device structure we want to register * @type: type of device to register * @nr: which device number (0 == /dev/video0, 1 == /dev/video1, ... * -1 == first free) + * @index: stream number based on parent device; + * -1 if auto assign, requested number otherwise * * The registration code assigns minor numbers based on the type * requested. -ENFILE is returned in all the device slots for this _ Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are linux-next.patch git-kbuild-fixes.patch genksyms-track-symbol-checksum-changes.patch genksyms-allow-to-ignore-symbol-checksum-changes.patch lkdtm-fix-for-config_scsi=n.patch e1000e-make-e1000e-default-to-the-same-kconfig-setting-as-e1000.patch netfilter-conntrack_helper-needs-to-include-rculisth.patch ftrace-printk-formatting-infrastructure-fix.patch git-unionfs.patch docsrc-build-documentation-sources.patch docsrc-fix-procfs-example.patch docsrc-fix-ifenslave-type.patch docsrc-fix-crc32hash-type.patch docsrc-fix-getdelays-printk-formats.patch rcu-fix-synchronize_rcu-so-that-kernel-doc-works.patch w1-documentation-w1-masters-ds2490-update.patch profile-likely-unlikely-macros.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