From c10a14769467049a14b12c7e91f5f7685cf2dd6a Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Wed, 18 Jul 2012 10:54:59 -0300
Subject: [PATCH] --- yaml --- r: 320631 b: refs/heads/master c:
 97a3c902e98d772f4310e81d44a27db0d1cf4ddd h: refs/heads/master i:   320629:
 ebb018c197de2abcb4a607a3c8af168083ac711f   320627:
 ccc6860d36e4aa471f8a9dc471ec37e2b67f6c93   320623:
 66c4458d75be0f1cde9de0f8b18f61aa29718d3b v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/video/mem2mem_testdev.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2b11e2c00054..d619b454a906 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08eb85100d114a907e01c76d52d5c95eb4100d20
+refs/heads/master: 97a3c902e98d772f4310e81d44a27db0d1cf4ddd
diff --git a/trunk/drivers/media/video/mem2mem_testdev.c b/trunk/drivers/media/video/mem2mem_testdev.c
index fe8c565f35a1..f7a2a2d635f5 100644
--- a/trunk/drivers/media/video/mem2mem_testdev.c
+++ b/trunk/drivers/media/video/mem2mem_testdev.c
@@ -28,6 +28,7 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-ctrls.h>
+#include <media/v4l2-event.h>
 #include <media/videobuf2-vmalloc.h>
 
 #define MEM2MEM_TEST_MODULE_NAME "mem2mem-testdev"
@@ -738,6 +739,8 @@ static const struct v4l2_ioctl_ops m2mtest_ioctl_ops = {
 
 	.vidioc_streamon	= vidioc_streamon,
 	.vidioc_streamoff	= vidioc_streamoff,
+	.vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
+	.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
 };