---

yaml --- r: 322845 b: refs/heads/master c: 254d4d1 h: refs/heads/master i: 322843: b8bf91b v: v3
git-mirror · Sep 13, 2012 · 2d29a6d · 2d29a6d
1 parent 31edb1c
commit 2d29a6d
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: 7da5907c84f8b092dc42b47b5c19684c1b3b4c98
+refs/heads/master: 254d4d111ee159a39d4afb30d9515036d1e0b027
diff --git a/trunk/drivers/gpu/drm/exynos/Kconfig b/trunk/drivers/gpu/drm/exynos/Kconfig
@@ -36,6 +36,6 @@ config DRM_EXYNOS_VIDI
 
 config DRM_EXYNOS_G2D
 	bool "Exynos DRM G2D"
-	depends on DRM_EXYNOS
+	depends on DRM_EXYNOS && !VIDEO_SAMSUNG_S5P_G2D
 	help
 	  Choose this option if you want to use Exynos G2D for DRM.