From 6b46c3977cdb34a199bbca20ef67b1e13335c43d 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] V4L/DVB: vivi and mem2mem_testdev need slab.h to build

Fix vivi and mem2mem_testdev build errors: need to #include <linux/slab.h>:

drivers/media/video/vivi.c:1144: error: implicit declaration of function 'kfree'
drivers/media/video/vivi.c:1156: error: implicit declaration of function 'kzalloc'
drivers/media/video/vivi.c:1156: warning: assignment makes pointer from integer without a cast
drivers/media/video/mem2mem_testdev.c:862: error: implicit declaration of function 'kzalloc'
drivers/media/video/mem2mem_testdev.c:862: warning: assignment makes pointer from integer without a cast
drivers/media/video/mem2mem_testdev.c:874: error: implicit declaration of function 'kfree'
drivers/media/video/mem2mem_testdev.c:944: warning: assignment makes pointer from integer without a cast

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
 drivers/media/video/mem2mem_testdev.c | 1 +
 drivers/media/video/vivi.c            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/media/video/mem2mem_testdev.c b/drivers/media/video/mem2mem_testdev.c
index b161d26b0ddf..554eaf140128 100644
--- a/drivers/media/video/mem2mem_testdev.c
+++ b/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/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index d5e30b85c559..e17b6fee046b 100644
--- a/drivers/media/video/vivi.c
+++ b/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>
-- 
2.20.1