aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pwc/pwc.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/pwc/pwc.h')
-rw-r--r--drivers/media/video/pwc/pwc.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h
index f1b206632957..36a9c83b5f5d 100644
--- a/drivers/media/video/pwc/pwc.h
+++ b/drivers/media/video/pwc/pwc.h
@@ -34,7 +34,7 @@
34#include <linux/mm.h> 34#include <linux/mm.h>
35#include <linux/slab.h> 35#include <linux/slab.h>
36#include <asm/errno.h> 36#include <asm/errno.h>
37#include <linux/videodev.h> 37#include <linux/videodev2.h>
38#include <media/v4l2-common.h> 38#include <media/v4l2-common.h>
39#include <media/v4l2-ioctl.h> 39#include <media/v4l2-ioctl.h>
40#ifdef CONFIG_USB_PWC_INPUT_EVDEV 40#ifdef CONFIG_USB_PWC_INPUT_EVDEV
@@ -49,7 +49,7 @@
49#define PWC_MINOR 0 49#define PWC_MINOR 0
50#define PWC_EXTRAMINOR 12 50#define PWC_EXTRAMINOR 12
51#define PWC_VERSION_CODE KERNEL_VERSION(PWC_MAJOR,PWC_MINOR,PWC_EXTRAMINOR) 51#define PWC_VERSION_CODE KERNEL_VERSION(PWC_MAJOR,PWC_MINOR,PWC_EXTRAMINOR)
52#define PWC_VERSION "10.0.13" 52#define PWC_VERSION "10.0.14"
53#define PWC_NAME "pwc" 53#define PWC_NAME "pwc"
54#define PFX PWC_NAME ": " 54#define PFX PWC_NAME ": "
55 55
@@ -180,7 +180,7 @@ struct pwc_device
180 int vcinterface; /* video control interface */ 180 int vcinterface; /* video control interface */
181 int valternate; /* alternate interface needed */ 181 int valternate; /* alternate interface needed */
182 int vframes, vsize; /* frames-per-second & size (see PSZ_*) */ 182 int vframes, vsize; /* frames-per-second & size (see PSZ_*) */
183 int vpalette; /* palette: 420P, RAW or RGBBAYER */ 183 int pixfmt; /* pixelformat: V4L2_PIX_FMT_YUV420 or raw: _PWC1, _PWC2 */
184 int vframe_count; /* received frames */ 184 int vframe_count; /* received frames */
185 int vframes_dumped; /* counter for dumped frames */ 185 int vframes_dumped; /* counter for dumped frames */
186 int vframes_error; /* frames received in error */ 186 int vframes_error; /* frames received in error */