summaryrefslogtreecommitdiff
path: root/linux/include/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-09-17 10:11:30 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-17 10:11:30 -0300
commitc7d66a73b2ab88ce7c12d867e2830ee221e58489 (patch)
tree999aadcd0060a35df5736526121faa248b7f90e5 /linux/include/media
parent7c561c60c12a727840a1b24c5e2c9b47d0864944 (diff)
parent47a1368908d1a5cd3548d44cfa19853c26ddfeaf (diff)
downloadmediapointer-dvb-s2-c7d66a73b2ab88ce7c12d867e2830ee221e58489.tar.gz
mediapointer-dvb-s2-c7d66a73b2ab88ce7c12d867e2830ee221e58489.tar.bz2
merge: http://linuxtv.org/hg/~anttip/reddo-dvb-c/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media')
-rw-r--r--linux/include/media/v4l2-dev.h4
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);