diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-08-24 17:11:22 +1000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2008-10-18 07:10:11 +1000 |
commit | dfcf96d09cff63c9aaa8e7c98bbc71e5073b1377 (patch) | |
tree | e0e1fa48edc6ce7b788f626ff7b7c567af636ccc /drivers | |
parent | 8ee1c3db9075cb3211352e737e0feb98fd733b20 (diff) | |
download | op-kernel-dev-dfcf96d09cff63c9aaa8e7c98bbc71e5073b1377.zip op-kernel-dev-dfcf96d09cff63c9aaa8e7c98bbc71e5073b1377.tar.gz |
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')
-rw-r--r-- | drivers/gpu/drm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 610d6fd..bf9003e 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 |