---

yaml --- r: 96706 b: refs/heads/master c: 039d400 h: refs/heads/master v: v3
git-mirror · May 14, 2008 · 324fb53 · 324fb53
1 parent fbcec1d
commit 324fb53
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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"