From 10b1ffc6ce7b804842707db75bcc86e8307523f9 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Thu, 27 Apr 2006 10:10:58 -0300
Subject: [PATCH] --- yaml --- r: 26915 b: refs/heads/master c:
 1095136dee95d27d27cebc52bd502f7facee8600 h: refs/heads/master i:   26913:
 c8771d765166639442d7c5883867fb76d2692999   26911:
 1fd6ba8932c3d148e52f64630345a0fd9bcd43fc v: v3

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

diff --git a/[refs] b/[refs]
index 7eff591ff2de..e043ff1a40c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 765bf9770fda950e6615451ad1a4b8866bda7dfa
+refs/heads/master: 1095136dee95d27d27cebc52bd502f7facee8600
diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c
index 9e42224b46b6..779db26771c0 100644
--- a/trunk/drivers/media/video/vivi.c
+++ b/trunk/drivers/media/video/vivi.c
@@ -26,6 +26,7 @@
 #include <linux/random.h>
 #include <linux/version.h>
 #include <linux/videodev2.h>
+#include <linux/dma-mapping.h>
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
 /* Include V4L1 specific functions. Should be removed soon */
 #include <linux/videodev.h>