From 83320b3d8bcf25a6a635588daa5e1547bb04bf22 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sun, 20 Jul 2008 20:26:54 -0300
Subject: Fix x86_64 compilation and move some macros to v4l2-ioctl.h

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 linux/drivers/media/video/compat_ioctl32.c | 2 +-
 linux/drivers/media/video/stradis.c        | 1 +
 linux/drivers/media/video/w9968cf.c        | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'linux/drivers')

diff --git a/linux/drivers/media/video/compat_ioctl32.c b/linux/drivers/media/video/compat_ioctl32.c
index 017c2a8d4..a37f3a64e 100644
--- a/linux/drivers/media/video/compat_ioctl32.c
+++ b/linux/drivers/media/video/compat_ioctl32.c
@@ -17,7 +17,7 @@
 #include <linux/videodev2.h>
 #include <linux/module.h>
 #include <linux/smp_lock.h>
-#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include "compat.h"
 
 #ifdef CONFIG_COMPAT
diff --git a/linux/drivers/media/video/stradis.c b/linux/drivers/media/video/stradis.c
index 67702588c..7f46a1d64 100644
--- a/linux/drivers/media/video/stradis.c
+++ b/linux/drivers/media/video/stradis.c
@@ -43,6 +43,7 @@
 #include <linux/vmalloc.h>
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #include "saa7146.h"
 #include "saa7146reg.h"
diff --git a/linux/drivers/media/video/w9968cf.c b/linux/drivers/media/video/w9968cf.c
index 55f677243..8e0f6bcfd 100644
--- a/linux/drivers/media/video/w9968cf.c
+++ b/linux/drivers/media/video/w9968cf.c
@@ -42,6 +42,7 @@
 #include <asm/page.h>
 #include <asm/uaccess.h>
 #include <linux/page-flags.h>
+#include <media/v4l2-ioctl.h>
 
 #include "w9968cf.h"
 #include "w9968cf_decoder.h"
-- 
cgit v1.2.3