diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 12:13:52 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 12:13:52 -0300 |
| commit | baf2c601d974ae7d46859426c35fdae28a0e7033 (patch) | |
| tree | d9d70a45831ed7a0dc5c0686fb16e1028bc19c5d /linux/include | |
| parent | d65762ce274a5e3cfe393763b41e518ec26a5974 (diff) | |
| parent | 4c691e7dabc47811013c7266fa5f32fe96687c36 (diff) | |
| download | mediapointer-dvb-s2-baf2c601d974ae7d46859426c35fdae28a0e7033.tar.gz mediapointer-dvb-s2-baf2c601d974ae7d46859426c35fdae28a0e7033.tar.bz2 | |
merge: http://linuxtv.org/hg/~anttip/af9015/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/media/v4l2-dev.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index 1cae97561..f813ae9c0 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -105,6 +105,10 @@ struct video_device Also note that vdev->minor is set to -1 if the registration failed. */ int __must_check video_register_device(struct video_device *vdev, int type, int nr); +/* Same as video_register_device, but no warning is issued if the desired + device node number was already in use. */ +int __must_check video_register_device_no_warn(struct video_device *vdev, int type, int nr); + /* Unregister video devices. Will do nothing if vdev == NULL or vdev->minor < 0. */ void video_unregister_device(struct video_device *vdev); |