From 2d29a6df29927c8338a5b5b2a9290cf4e81ae277 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Tue, 14 Aug 2012 12:07:20 +0530
Subject: [PATCH] --- yaml --- r: 322845 b: refs/heads/master c:
 254d4d111ee159a39d4afb30d9515036d1e0b027 h: refs/heads/master i:   322843:
 b8bf91bc645b8b658b034327461d8caeb9ba984e v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/gpu/drm/exynos/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 82caa9d1b7e3..c53494388647 100644
--- 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
index 7f5096763b7d..59a26e577b57 100644
--- 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.