diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-04 14:28:46 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-04 14:28:46 -0300 |
commit | d80b9a6dbd8d4d3d0366b9ccb92e6afb51f45554 (patch) | |
tree | 11ad4b32d1a6c7af99a5bd433143439942b59820 /linux/drivers/media/video/v4l2-dev.c | |
parent | 4bd253361a4d78401fee5c40b508d2e23434df05 (diff) | |
download | mediapointer-dvb-s2-d80b9a6dbd8d4d3d0366b9ccb92e6afb51f45554.tar.gz mediapointer-dvb-s2-d80b9a6dbd8d4d3d0366b9ccb92e6afb51f45554.tar.bz2 |
backport changeset c9b1a9b0ec5cc30279fd51ea11f04432683961cc
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date: Mon Jul 28 15:39:38 2008 -0300
V4L/DVB (8549a): fix kernel-doc warning, function name, and docbook filename
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: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/v4l2-dev.c')
-rw-r--r-- | linux/drivers/media/video/v4l2-dev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/v4l2-dev.c b/linux/drivers/media/video/v4l2-dev.c index c3d3212fd..398376a40 100644 --- a/linux/drivers/media/video/v4l2-dev.c +++ b/linux/drivers/media/video/v4l2-dev.c @@ -257,11 +257,13 @@ int video_register_device(struct video_device *vfd, int type, int nr) 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 |