From b6be041a4d869f0654f007857c69e65903ec9cc0 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sun, 24 Aug 2008 17:11:22 +1000 Subject: [PATCH] --- yaml --- r: 115699 b: refs/heads/master c: dfcf96d09cff63c9aaa8e7c98bbc71e5073b1377 h: refs/heads/master i: 115697: df43c4647eb083ef15d96d5cc1f01de72d811cad 115695: 929d913501cb405984b2b32b49e6a7ab6bb86f18 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/Kconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 464eee791ebf..6405b21a15f6 100644 --- 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 index 610d6fd5bb50..bf9003ee7aba 100644 --- 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