diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-29 10:51:00 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-29 10:51:00 -0200 |
| commit | 7c0917f006a519be5e54c6405f54dea61ca06b7a (patch) | |
| tree | 47a8e3218398355b7ba1cdf59b9390afa003fdc9 /linux/drivers/media/video/pwc/pwc.h | |
| parent | b1ccf703c9015bc3257716ffccd33ca147f7a1a8 (diff) | |
| parent | 68a6fa1ae421b7c28eb6b8365f3adfd08007e7b7 (diff) | |
| download | mediapointer-dvb-s2-7c0917f006a519be5e54c6405f54dea61ca06b7a.tar.gz mediapointer-dvb-s2-7c0917f006a519be5e54c6405f54dea61ca06b7a.tar.bz2 | |
commit backport
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/pwc/pwc.h')
| -rw-r--r-- | linux/drivers/media/video/pwc/pwc.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linux/drivers/media/video/pwc/pwc.h b/linux/drivers/media/video/pwc/pwc.h index a76971ead..3a89dca13 100644 --- a/linux/drivers/media/video/pwc/pwc.h +++ b/linux/drivers/media/video/pwc/pwc.h @@ -38,6 +38,9 @@ #include <linux/videodev.h> #include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> +#ifdef CONFIG_USB_PWC_INPUT_EVDEV +#include <linux/input.h> +#endif #include "pwc-uncompress.h" #include <media/pwc-ioctl.h> @@ -256,6 +259,9 @@ struct pwc_device int pan_angle; /* in degrees * 100 */ int tilt_angle; /* absolute angle; 0,0 is home position */ int snapshot_button_status; /* set to 1 when the user push the button, reset to 0 when this value is read */ +#ifdef CONFIG_USB_PWC_INPUT_EVDEV + struct input_dev *button_dev; /* webcam snapshot button input */ +#endif /*** Misc. data ***/ wait_queue_head_t frameq; /* When waiting for a frame to finish... */ |