From 11906e50b43e503ebce7d791bc02ba6fb33dac0a Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Fri, 7 May 2010 15:22:26 -0300
Subject: [PATCH] --- yaml --- r: 193164 b: refs/heads/master c:
 6b46c3977cdb34a199bbca20ef67b1e13335c43d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index fcc4518ac088..41584d8c2efd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c7c5e9e8903f201bdbc85bdffba47a2d1352e4c
+refs/heads/master: 6b46c3977cdb34a199bbca20ef67b1e13335c43d
diff --git a/trunk/drivers/media/video/mem2mem_testdev.c b/trunk/drivers/media/video/mem2mem_testdev.c
index b161d26b0ddf..554eaf140128 100644
--- a/trunk/drivers/media/video/mem2mem_testdev.c
+++ b/trunk/drivers/media/video/mem2mem_testdev.c
@@ -22,6 +22,7 @@
 #include <linux/version.h>
 #include <linux/timer.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 
 #include <linux/platform_device.h>
 #include <media/v4l2-mem2mem.h>
diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c
index d5e30b85c559..e17b6fee046b 100644
--- a/trunk/drivers/media/video/vivi.c
+++ b/trunk/drivers/media/video/vivi.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 #include <linux/font.h>
 #include <linux/version.h>
 #include <linux/mutex.h>