diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2011-07-19 07:14:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-06 10:41:42 -0200 |
| commit | 76ae853844dff124559e1b609b0c71c792a98221 (patch) | |
| tree | 3fe4d53c1197d7af9bc99b17657e2faa179934a0 /drivers/media/video/pwc/pwc.h | |
| parent | ee186fd96a5f98f971316d26822b94c331d56a57 (diff) | |
[media] pwc: Use v4l2-device and v4l2-fh
This is a preperation patch for adding support for control events. Actually
enabling support for control events will be done in a separate patch, as that
depends on the necessary poll changes going upstream
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/pwc/pwc.h')
| -rw-r--r-- | drivers/media/video/pwc/pwc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h index 0e4e2d7b787..dd75b9dbe82 100644 --- a/drivers/media/video/pwc/pwc.h +++ b/drivers/media/video/pwc/pwc.h @@ -35,8 +35,11 @@ #include <asm/errno.h> #include <linux/videodev2.h> #include <media/v4l2-common.h> +#include <media/v4l2-device.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-ctrls.h> +#include <media/v4l2-fh.h> +#include <media/v4l2-event.h> #include <media/videobuf2-vmalloc.h> #ifdef CONFIG_USB_PWC_INPUT_EVDEV #include <linux/input.h> @@ -198,6 +201,7 @@ struct pwc_frame_buf struct pwc_device { struct video_device vdev; + struct v4l2_device v4l2_dev; struct mutex modlock; /* Pointer to our usb_device, may be NULL after unplug */ |