---

yaml --- r: 286855 b: refs/heads/master c: 2363dc6 h: refs/heads/master i: 286853: 5daaed4 286851: b6ee036 286847: db1b22e v: v3
git-mirror · Jan 27, 2012 · 1409dad · 1409dad
1 parent 258b164
commit 1409dad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 485bc54c3360e9c1d595c48c9c82dbd3a51e133e
+refs/heads/master: 2363dc636df34abb795c31668eeadc659e815fbd
diff --git a/trunk/drivers/gpu/drm/exynos/Kconfig b/trunk/drivers/gpu/drm/exynos/Kconfig
@@ -21,7 +21,7 @@ config DRM_EXYNOS_FIMD
 
 config DRM_EXYNOS_HDMI
 	tristate "Exynos DRM HDMI"
-	depends on DRM_EXYNOS
+	depends on DRM_EXYNOS && !VIDEO_SAMSUNG_S5P_TV
 	help
 	  Choose this option if you want to use Exynos HDMI for DRM.
 	  If M is selected, the module will be called exynos_drm_hdmi