X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fmedia%2FKconfig;h=7a7803b5d4976353b8a475a9eebf98a9e94da52a;hb=bf5b1935d8e42b36a34645788eb261461fe07f2e;hp=ddf57e135c6c61633fa030dd623a67d5072491c0;hpb=2a5f2e3e6cd1ce9fb3f8b186b6bc9aa1f1497a92;p=linux-2.6

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index ddf57e135c..7a7803b5d4 100644
--- a/drivers/media/Kconfig
+++ b/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"