aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-08-24 03:11:22 -0400
committerDave Airlie <airlied@linux.ie>2008-10-17 17:10:11 -0400
commitdfcf96d09cff63c9aaa8e7c98bbc71e5073b1377 (patch)
treee0e1fa48edc6ce7b788f626ff7b7c567af636ccc /drivers/gpu
parent8ee1c3db9075cb3211352e737e0feb98fd733b20 (diff)
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 610d6fd5bb50..bf9003ee7aba 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -87,6 +87,7 @@ config DRM_MGA
87config DRM_SIS 87config DRM_SIS
88 tristate "SiS video cards" 88 tristate "SiS video cards"
89 depends on DRM && AGP 89 depends on DRM && AGP
90 depends on FB_SIS || FB_SIS=n
90 help 91 help
91 Choose this option if you have a SiS 630 or compatible video 92 Choose this option if you have a SiS 630 or compatible video
92 chipset. If M is selected the module will be called sis. AGP 93 chipset. If M is selected the module will be called sis. AGP