Merge tag 'fbdev-main-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba...

[cascardo/linux.git] / drivers / video / Kconfig

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 97a8f3a..6c793bc 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -796,18 +796,9 @@ config FB_HGA
          As this card technology is at least 25 years old,
          most people will answer N here.
 
-config FB_SGIVW
-       tristate "SGI Visual Workstation framebuffer support"
-       depends on FB && X86_VISWS
-       select FB_CFB_FILLRECT
-       select FB_CFB_COPYAREA
-       select FB_CFB_IMAGEBLIT
-       help
-         SGI Visual Workstation support for framebuffer graphics.
-
 config FB_GBE
        bool "SGI Graphics Backend frame buffer support"
-       depends on (FB = y) && (SGI_IP32 || X86_VISWS)
+       depends on (FB = y) && SGI_IP32
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -976,7 +967,7 @@ config FB_PVR2
 
 config FB_OPENCORES
        tristate "OpenCores VGA/LCD core 2.0 framebuffer support"
-       depends on FB
+       depends on FB && HAS_DMA
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT