Export tiny shmem_file_setup for DRM-GEM

[linux-2.6-omap-h63xx.git] / drivers / gpu / drm / Kconfig

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 610d6fd5bb505a0dc568935477a9159a11a4ae1b..a8b33c2ec8d2fa951a4b81509cf944eb0e4759af 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -6,7 +6,7 @@
 #
 menuconfig DRM
        tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
-       depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG
+       depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG && MMU
        help
          Kernel-level support for the Direct Rendering Infrastructure (DRI)
          introduced in XFree86 4.0. If you say Y here, you need to select
@@ -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