From 24bda047c0558518cdd4845894af9a62fe0cfe36 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Tue, 11 Apr 2006 17:55:53 -0300
Subject: Merge: from V4L1 tree

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



Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
 linux/drivers/media/video/cx88/cx88-video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux/drivers/media/video/cx88/cx88-video.c')

diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c
index e17c91b4c..9c2f0dd39 100644
--- a/linux/drivers/media/video/cx88/cx88-video.c
+++ b/linux/drivers/media/video/cx88/cx88-video.c
@@ -38,7 +38,7 @@
 #include "cx88.h"
 #include <media/v4l2-common.h>
 
-#if 1
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
 /* Include V4L1 specific functions. Should be removed soon */
 #include <linux/videodev.h>
 #endif
-- 
cgit v1.2.3