V4L/DVB: ivtv: support the new events API

[linux-imx.git] / drivers / media / video / ivtv / ivtv-driver.h

diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index 851f07de52968ee5d651eb801e8ffe8ee33b4c89..5b45fd2b26458f8d5ad77e788e47a5d6bc48d851 100644 (file)
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -63,6 +63,7 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-device.h>
+#include <media/v4l2-fh.h>
 #include <media/tuner.h>
 #include <media/cx2341x.h>
 #include <media/ir-kbd-i2c.h>
@@ -375,6 +376,7 @@ struct ivtv_stream {
 };
 
 struct ivtv_open_id {
+       struct v4l2_fh fh;
        u32 open_id;                    /* unique ID for this file descriptor */
        int type;                       /* stream type */
        int yuv_frames;                 /* 1: started OUT_UDMA_YUV output mode */
@@ -382,6 +384,11 @@ struct ivtv_open_id {
        struct ivtv *itv;
 };
 
+static inline struct ivtv_open_id *fh2id(struct v4l2_fh *fh)
+{
+       return container_of(fh, struct ivtv_open_id, fh);
+}
+
 struct yuv_frame_info
 {
        u32 update;