From: Adrian Bunk <bunk@kernel.org>
Date: Sun, 24 Aug 2008 07:11:22 +0000 (+1000)
Subject: FB_SIS=m, DRM_SIS=y is not a legal configuration.
X-Git-Tag: v2.6.28-rc1~255^2~33
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=dfcf96d09cff63c9aaa8e7c98bbc71e5073b1377;p=linux-2.6-omap-h63xx.git

FB_SIS=m, DRM_SIS=y is not a legal configuration.

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 610d6fd5bb5..bf9003ee7ab 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -87,6 +87,7 @@ config DRM_MGA
 config DRM_SIS
 	tristate "SiS video cards"
 	depends on DRM && AGP
+	depends on FB_SIS || FB_SIS=n
 	help
 	  Choose this option if you have a SiS 630 or compatible video
           chipset. If M is selected the module will be called sis. AGP