---

yaml --- r: 115699 b: refs/heads/master c: dfcf96d h: refs/heads/master i: 115697: df43c46 115695: 929d913 v: v3
git-mirror · Oct 17, 2008 · b6be041 · b6be041
1 parent 3f9832d
commit b6be041
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ee1c3db9075cb3211352e737e0feb98fd733b20
+refs/heads/master: dfcf96d09cff63c9aaa8e7c98bbc71e5073b1377
diff --git a/trunk/drivers/gpu/drm/Kconfig b/trunk/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