diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-11 18:40:00 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-11 18:40:00 -0300 |
| commit | 91b24eda72df7f1320bf3b064515c96039bfca0d (patch) | |
| tree | 99e8ea8f19c28758417d4c3398523595359d48c7 /linux/drivers/media/video/uvc/uvcvideo.h | |
| parent | 2fca1e165c0f13087c2eaed3d0e4a4c4fbb24fe5 (diff) | |
| parent | fd4694cdbe15f591792ec5166c3d9791c4b1e34f (diff) | |
| download | mediapointer-dvb-s2-91b24eda72df7f1320bf3b064515c96039bfca0d.tar.gz mediapointer-dvb-s2-91b24eda72df7f1320bf3b064515c96039bfca0d.tar.bz2 | |
merge: http://linuxtv.org/hg/~dougsland/video4linux
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/uvc/uvcvideo.h')
| -rw-r--r-- | linux/drivers/media/video/uvc/uvcvideo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/uvc/uvcvideo.h b/linux/drivers/media/video/uvc/uvcvideo.h index 6b254fd39..de13c86f2 100644 --- a/linux/drivers/media/video/uvc/uvcvideo.h +++ b/linux/drivers/media/video/uvc/uvcvideo.h @@ -314,7 +314,6 @@ struct uvc_xu_control { #define UVC_QUIRK_BUILTIN_ISIGHT 0x00000008 #define UVC_QUIRK_STREAM_NO_FID 0x00000010 #define UVC_QUIRK_IGNORE_SELECTOR_UNIT 0x00000020 -#define UVC_QUIRK_PRUNE_CONTROLS 0x00000040 #define UVC_QUIRK_FIX_BANDWIDTH 0x00000080 /* Format flags */ @@ -749,6 +748,7 @@ extern struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue, struct uvc_buffer *buf); extern unsigned int uvc_queue_poll(struct uvc_video_queue *queue, struct file *file, poll_table *wait); +extern int uvc_queue_allocated(struct uvc_video_queue *queue); static inline int uvc_queue_streaming(struct uvc_video_queue *queue) { return queue->flags & UVC_QUEUE_STREAMING; |