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"