diff options
Diffstat (limited to 'drivers/media/video/pwc/pwc.h')
-rw-r--r-- | drivers/media/video/pwc/pwc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h index e778a2b8c280..acbb9312960a 100644 --- a/drivers/media/video/pwc/pwc.h +++ b/drivers/media/video/pwc/pwc.h | |||
@@ -44,7 +44,7 @@ | |||
44 | #define PWC_MINOR 0 | 44 | #define PWC_MINOR 0 |
45 | #define PWC_EXTRAMINOR 12 | 45 | #define PWC_EXTRAMINOR 12 |
46 | #define PWC_VERSION_CODE KERNEL_VERSION(PWC_MAJOR,PWC_MINOR,PWC_EXTRAMINOR) | 46 | #define PWC_VERSION_CODE KERNEL_VERSION(PWC_MAJOR,PWC_MINOR,PWC_EXTRAMINOR) |
47 | #define PWC_VERSION "10.0.12" | 47 | #define PWC_VERSION "10.0.13" |
48 | #define PWC_NAME "pwc" | 48 | #define PWC_NAME "pwc" |
49 | #define PFX PWC_NAME ": " | 49 | #define PFX PWC_NAME ": " |
50 | 50 | ||
@@ -85,7 +85,7 @@ | |||
85 | #define PWC_INFO(fmt, args...) printk(KERN_INFO PFX fmt, ##args) | 85 | #define PWC_INFO(fmt, args...) printk(KERN_INFO PFX fmt, ##args) |
86 | #define PWC_TRACE(fmt, args...) PWC_DEBUG(TRACE, fmt, ##args) | 86 | #define PWC_TRACE(fmt, args...) PWC_DEBUG(TRACE, fmt, ##args) |
87 | 87 | ||
88 | #else /* if ! CONFIG_PWC_DEBUG */ | 88 | #else /* if ! CONFIG_USB_PWC_DEBUG */ |
89 | 89 | ||
90 | #define PWC_ERROR(fmt, args...) printk(KERN_ERR PFX fmt, ##args) | 90 | #define PWC_ERROR(fmt, args...) printk(KERN_ERR PFX fmt, ##args) |
91 | #define PWC_WARNING(fmt, args...) printk(KERN_WARNING PFX fmt, ##args) | 91 | #define PWC_WARNING(fmt, args...) printk(KERN_WARNING PFX fmt, ##args) |
@@ -287,6 +287,7 @@ void pwc_construct(struct pwc_device *pdev); | |||
287 | /** Functions in pwc-ctrl.c */ | 287 | /** Functions in pwc-ctrl.c */ |
288 | /* Request a certain video mode. Returns < 0 if not possible */ | 288 | /* Request a certain video mode. Returns < 0 if not possible */ |
289 | extern int pwc_set_video_mode(struct pwc_device *pdev, int width, int height, int frames, int compression, int snapshot); | 289 | extern int pwc_set_video_mode(struct pwc_device *pdev, int width, int height, int frames, int compression, int snapshot); |
290 | extern unsigned int pwc_get_fps(struct pwc_device *pdev, unsigned int index, unsigned int size); | ||
290 | /* Calculate the number of bytes per image (not frame) */ | 291 | /* Calculate the number of bytes per image (not frame) */ |
291 | extern int pwc_mpt_reset(struct pwc_device *pdev, int flags); | 292 | extern int pwc_mpt_reset(struct pwc_device *pdev, int flags); |
292 | extern int pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt); | 293 | extern int pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt); |