From 356ef8eacacb4c3fd9c2a90f96f3bc4b59b99fd8 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 18 Oct 2010 21:18:49 -0300
Subject: [PATCH] --- yaml --- r: 219458 b: refs/heads/master c:
 437258432a322e12a80fae57237aa9b87b0b9e60 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/video/cx231xx/cx231xx.h | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e208fe0f0b84..312cabbbf7c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44ed8950f8529ad58becc2de2f14a49ad32393ad
+refs/heads/master: 437258432a322e12a80fae57237aa9b87b0b9e60
diff --git a/trunk/drivers/media/video/cx231xx/cx231xx.h b/trunk/drivers/media/video/cx231xx/cx231xx.h
index 9c98886ffb46..d067df9b81e7 100644
--- a/trunk/drivers/media/video/cx231xx/cx231xx.h
+++ b/trunk/drivers/media/video/cx231xx/cx231xx.h
@@ -35,10 +35,7 @@
 #include <media/videobuf-vmalloc.h>
 #include <media/v4l2-device.h>
 #include <media/ir-core.h>
-#if defined(CONFIG_VIDEO_CX231XX_DVB) || \
-	defined(CONFIG_VIDEO_CX231XX_DVB_MODULE)
 #include <media/videobuf-dvb.h>
-#endif
 
 #include "cx231xx-reg.h"
 #include "cx231xx-pcb-cfg.h"