diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-06 10:03:10 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-06 10:03:10 -0300 |
| commit | 76775b7f2ced0c0301ac3ae201aafc3d9b88e091 (patch) | |
| tree | f0ad9167da8049f5b468fe5a58a1f438450665d6 /linux/drivers/media/video/pwc/pwc.h | |
| parent | 8ab655cc3c286a78e3af8ac2a88a839ea073306a (diff) | |
| parent | 46cf6abc45f699c5843872c7ef8e782e4d0e1a27 (diff) | |
| download | mediapointer-dvb-s2-76775b7f2ced0c0301ac3ae201aafc3d9b88e091.tar.gz mediapointer-dvb-s2-76775b7f2ced0c0301ac3ae201aafc3d9b88e091.tar.bz2 | |
merge: http://linuxtv.org/hg/~aapot/m920x
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pwc/pwc.h')
| -rw-r--r-- | linux/drivers/media/video/pwc/pwc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pwc/pwc.h b/linux/drivers/media/video/pwc/pwc.h index e778a2b8c..acbb93129 100644 --- a/linux/drivers/media/video/pwc/pwc.h +++ b/linux/drivers/media/video/pwc/pwc.h @@ -44,7 +44,7 @@ #define PWC_MINOR 0 #define PWC_EXTRAMINOR 12 #define PWC_VERSION_CODE KERNEL_VERSION(PWC_MAJOR,PWC_MINOR,PWC_EXTRAMINOR) -#define PWC_VERSION "10.0.12" +#define PWC_VERSION "10.0.13" #define PWC_NAME "pwc" #define PFX PWC_NAME ": " @@ -85,7 +85,7 @@ #define PWC_INFO(fmt, args...) printk(KERN_INFO PFX fmt, ##args) #define PWC_TRACE(fmt, args...) PWC_DEBUG(TRACE, fmt, ##args) -#else /* if ! CONFIG_PWC_DEBUG */ +#else /* if ! CONFIG_USB_PWC_DEBUG */ #define PWC_ERROR(fmt, args...) printk(KERN_ERR PFX fmt, ##args) #define PWC_WARNING(fmt, args...) printk(KERN_WARNING PFX fmt, ##args) @@ -287,6 +287,7 @@ void pwc_construct(struct pwc_device *pdev); /** Functions in pwc-ctrl.c */ /* Request a certain video mode. Returns < 0 if not possible */ extern int pwc_set_video_mode(struct pwc_device *pdev, int width, int height, int frames, int compression, int snapshot); +extern unsigned int pwc_get_fps(struct pwc_device *pdev, unsigned int index, unsigned int size); /* Calculate the number of bytes per image (not frame) */ extern int pwc_mpt_reset(struct pwc_device *pdev, int flags); extern int pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt); |