From f59fc4791c789c98f0e86551e7ddb201fa996591 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 17 Jun 2008 17:37:51 -0300
Subject: [PATCH] --- yaml --- r: 98497 b: refs/heads/master c:
 beb31e636501f39e853ac5d0ffd3fbb910d19d5c h: refs/heads/master i:   98495:
 597b1963912c5f1c6e55da1f1cbea882e7cfdceb v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/video/cx18/Kconfig | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 77a51c271433..26268b096fd0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e501a3f4a7259b1c04aa6cbdfe64376afc9f59c
+refs/heads/master: beb31e636501f39e853ac5d0ffd3fbb910d19d5c
diff --git a/trunk/drivers/media/video/cx18/Kconfig b/trunk/drivers/media/video/cx18/Kconfig
index 5f942690570c..9aefdc5ea79a 100644
--- a/trunk/drivers/media/video/cx18/Kconfig
+++ b/trunk/drivers/media/video/cx18/Kconfig
@@ -10,8 +10,8 @@ config VIDEO_CX18
 	select VIDEO_TVEEPROM
 	select VIDEO_CX2341X
 	select VIDEO_CS5345
-	select DVB_S5H1409
-	select MEDIA_TUNER_MXL5005S
+	select DVB_S5H1409 if !DVB_FE_CUSTOMISE
+	select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE
 	---help---
 	  This is a video4linux driver for Conexant cx23418 based
 	  PCI combo video recorder devices.