1 files changed, 3 insertions, 43 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 3ab06317264..3546484fa50 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -354,42 +354,6 @@ config FB_AMIGA_AGA
           and CD32. If you intend to run Linux on any of these systems, say Y;
           otherwise say N.
 
-config FB_CYBER
-        tristate "Amiga CyberVision 64 support"
-        depends on FB && ZORRO && BROKEN
-        select FB_CFB_FILLRECT
-        select FB_CFB_COPYAREA
-        select FB_CFB_IMAGEBLIT
-        help
-          This enables support for the Cybervision 64 graphics card from
-          Phase5. Please note that its use is not all that intuitive (i.e. if
-          you have any questions, be sure to ask!). Say N unless you have a
-          Cybervision 64 or plan to get one before you next recompile the
-          kernel. Please note that this driver DOES NOT support the
-          Cybervision 64/3D card, as they use incompatible video chips.
-
-config FB_VIRGE
-        bool "Amiga CyberVision 64/3D support "
-        depends on (FB = y) && ZORRO && BROKEN
-        select FB_CFB_FILLRECT
-        select FB_CFB_COPYAREA
-        select FB_CFB_IMAGEBLIT
-        help
-          This enables support for the Cybervision 64/3D graphics card from
-          Phase5. Please note that its use is not all that intuitive (i.e. if
-          you have any questions, be sure to ask!). Say N unless you have a
-          Cybervision 64/3D or plan to get one before you next recompile the
-          kernel. Please note that this driver DOES NOT support the older
-          Cybervision 64 card, as they use incompatible video chips.
-
-config FB_RETINAZ3
-        tristate "Amiga Retina Z3 support"
-        depends on (FB = y) && ZORRO && BROKEN
-        help
-          This enables support for the Retina Z3 graphics card. Say N unless
-          you have a Retina Z3 or plan to get one before you next recompile
-          the kernel.
-
 config FB_FM2
         bool "Amiga FrameMaster II/Rainbow II support"
         depends on (FB = y) && ZORRO
@@ -625,10 +589,6 @@ config FB_GBE_MEM
           This is the amount of memory reserved for the framebuffer,
           which can be any value between 1MB and 8MB.
 
-config FB_SUN3
-        bool "Sun3 framebuffer support"
-        depends on (FB = y) && (SUN3 || SUN3X) && BROKEN
-
 config FB_SBUS
         bool "SBUS and UPA framebuffers"
         depends on (FB = y) && SPARC
@@ -637,7 +597,7 @@ config FB_SBUS
 
 config FB_BW2
         bool "BWtwo support"
-        depends on (FB = y) && (SPARC && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+        depends on (FB = y) && (SPARC && FB_SBUS)
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -646,7 +606,7 @@ config FB_BW2
 
 config FB_CG3
         bool "CGthree support"
-        depends on (FB = y) && (SPARC && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+        depends on (FB = y) && (SPARC && FB_SBUS)
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -655,7 +615,7 @@ config FB_CG3
 
 config FB_CG6
         bool "CGsix (GX,TurboGX) support"
-        depends on (FB = y) && (SPARC && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+        depends on (FB = y) && (SPARC && FB_SBUS)
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         help