From dfcf96d09cff63c9aaa8e7c98bbc71e5073b1377 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sun, 24 Aug 2008 17:11:22 +1000 Subject: FB_SIS=m, DRM_SIS=y is not a legal configuration. Reported-by: Randy Dunlap Signed-off-by: Adrian Bunk Signed-off-by: Dave Airlie --- drivers/gpu/drm/Kconfig | 1 + 1 file changed, 1 insertion(+) 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 -- cgit v1.2.3