From 324fb53b4530687d18d790104082a6502c4794ca Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Wed, 14 May 2008 04:36:22 -0300
Subject: [PATCH] --- yaml --- r: 96706 b: refs/heads/master c:
 039d40019f3c5e26ea50ec5af4270189f63365e1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0063902df761..c2cbe1c30e1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee04e0faad386141f52dd812f220a2f0d128f1c6
+refs/heads/master: 039d40019f3c5e26ea50ec5af4270189f63365e1
diff --git a/trunk/drivers/media/Kconfig b/trunk/drivers/media/Kconfig
index ddf57e135c6c..7a7803b5d497 100644
--- a/trunk/drivers/media/Kconfig
+++ b/trunk/drivers/media/Kconfig
@@ -89,8 +89,7 @@ config DVB_CORE
 
 config VIDEO_MEDIA
 	tristate
-	default DVB_CORE || VIDEO_DEV
-	depends on DVB_CORE || VIDEO_DEV
+	default (DVB_CORE && (VIDEO_DEV = n)) || (VIDEO_DEV && (DVB_CORE = n)) || (DVB_CORE && VIDEO_DEV)
 
 comment "Multimedia drivers"