From 1d38adc4504b107d08fa38562371fce6fef94827 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Mon, 9 Aug 2010 14:56:35 -0300
Subject: [PATCH] --- yaml --- r: 209285 b: refs/heads/master c:
 2b80163c390b593bad313f64948993475bfd6069 h: refs/heads/master i:   209283:
 aa6edf26c71de1700b4fe7b3798fc3af09d53418 v: v3

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

diff --git a/[refs] b/[refs]
index e2983acfd806..e58e782356f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 361be7b1d099b671e01ca56b59b1e8b8e9ce4771
+refs/heads/master: 2b80163c390b593bad313f64948993475bfd6069
diff --git a/trunk/drivers/media/video/v4l2-ctrls.c b/trunk/drivers/media/video/v4l2-ctrls.c
index 84c1a53a727a..ea8d32cd425d 100644
--- a/trunk/drivers/media/video/v4l2-ctrls.c
+++ b/trunk/drivers/media/video/v4l2-ctrls.c
@@ -19,6 +19,7 @@
  */
 
 #include <linux/ctype.h>
+#include <linux/slab.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ctrls.h>