From: Dave Airlie <airlied@redhat.com>
Date: Fri, 28 Jun 2013 02:08:10 +0000 (+1000)
Subject: drm/omap: drop the !FB_OMAP2 dep
X-Git-Tag: v3.11-rc1~65^2~37
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2644ee9614be67abe155f1073bb9e1b737bbca53;p=~emulex%2Finfiniband.git

drm/omap: drop the !FB_OMAP2 dep

This ends up causing circularity and really let people shoot themselves
in the foot.

Acked-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/drivers/gpu/drm/omapdrm/Kconfig b/drivers/gpu/drm/omapdrm/Kconfig
index 45875a066bb..20c41e73d44 100644
--- a/drivers/gpu/drm/omapdrm/Kconfig
+++ b/drivers/gpu/drm/omapdrm/Kconfig
@@ -1,7 +1,7 @@
 
 config DRM_OMAP
 	tristate "OMAP DRM"
-	depends on DRM && !FB_OMAP2
+	depends on DRM
 	depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
 	depends on OMAP2_DSS
 	select DRM_KMS_HELPER