diff options
| -rw-r--r-- | Documentation/DocBook/videobook.tmpl | 2 | ||||
| -rw-r--r-- | drivers/media/video/v4l2-dev.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/DocBook/videobook.tmpl b/Documentation/DocBook/videobook.tmpl index 89817795e668..0bc25949b668 100644 --- a/Documentation/DocBook/videobook.tmpl +++ b/Documentation/DocBook/videobook.tmpl | |||
| @@ -1648,7 +1648,7 @@ static struct video_buffer capture_fb; | |||
| 1648 | 1648 | ||
| 1649 | <chapter id="pubfunctions"> | 1649 | <chapter id="pubfunctions"> |
| 1650 | <title>Public Functions Provided</title> | 1650 | <title>Public Functions Provided</title> |
| 1651 | !Edrivers/media/video/videodev.c | 1651 | !Edrivers/media/video/v4l2-dev.c |
| 1652 | </chapter> | 1652 | </chapter> |
| 1653 | 1653 | ||
| 1654 | </book> | 1654 | </book> |
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c index 556615fe93de..6f36006aecda 100644 --- a/drivers/media/video/v4l2-dev.c +++ b/drivers/media/video/v4l2-dev.c | |||
| @@ -222,11 +222,13 @@ int video_register_device(struct video_device *vfd, int type, int nr) | |||
| 222 | EXPORT_SYMBOL(video_register_device); | 222 | EXPORT_SYMBOL(video_register_device); |
| 223 | 223 | ||
| 224 | /** | 224 | /** |
| 225 | * video_register_device - register video4linux devices | 225 | * video_register_device_index - register video4linux devices |
| 226 | * @vfd: video device structure we want to register | 226 | * @vfd: video device structure we want to register |
| 227 | * @type: type of device to register | 227 | * @type: type of device to register |
| 228 | * @nr: which device number (0 == /dev/video0, 1 == /dev/video1, ... | 228 | * @nr: which device number (0 == /dev/video0, 1 == /dev/video1, ... |
| 229 | * -1 == first free) | 229 | * -1 == first free) |
| 230 | * @index: stream number based on parent device; | ||
| 231 | * -1 if auto assign, requested number otherwise | ||
| 230 | * | 232 | * |
| 231 | * The registration code assigns minor numbers based on the type | 233 | * The registration code assigns minor numbers based on the type |
| 232 | * requested. -ENFILE is returned in all the device slots for this | 234 | * requested. -ENFILE is returned in all the device slots for this |
