summaryrefslogtreecommitdiff
path: root/linux/include/media/v4l2-dev.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-08-26 15:51:30 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-08-26 15:51:30 -0300
commitd20c7e6a12b8c15e0574c2cb7599ce6195684bd0 (patch)
tree8a28a76523c4ec7a1f9be086f4e5a3ed5cfdd903 /linux/include/media/v4l2-dev.h
parentd8d58fb352c495a1eea213a365f003435456a6d6 (diff)
parent06db2bf24db3684dec5bc4cb6883c196e8a8cbba (diff)
downloadmediapointer-dvb-s2-d20c7e6a12b8c15e0574c2cb7599ce6195684bd0.tar.gz
mediapointer-dvb-s2-d20c7e6a12b8c15e0574c2cb7599ce6195684bd0.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core2
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media/v4l2-dev.h')
-rw-r--r--linux/include/media/v4l2-dev.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h
index 978e26506..1cae97561 100644
--- a/linux/include/media/v4l2-dev.h
+++ b/linux/include/media/v4l2-dev.h
@@ -104,8 +104,6 @@ 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);
-int __must_check video_register_device_index(struct video_device *vdev,
- int type, int nr, int index);
/* Unregister video devices. Will do nothing if vdev == NULL or
vdev->minor < 0. */