1 files changed, 11 insertions, 10 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 25b6ca6ad081..cc8e3bf5001b 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -534,9 +534,15 @@ 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
+        help
+          Say Y if you want support for SBUS or UPA based frame buffer device.
+
 config FB_BW2
         bool "BWtwo support"
-        depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+        depends on (FB = y) && (SPARC && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -545,7 +551,8 @@ config FB_BW2
 
 config FB_CG3
         bool "CGthree support"
-        depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+        depends on (FB = y) && (SPARC && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+        select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         help
@@ -553,7 +560,7 @@ config FB_CG3
 
 config FB_CG6
         bool "CGsix (GX,TurboGX) support"
-        depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+        depends on (FB = y) && (SPARC && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
         help
@@ -1210,12 +1217,6 @@ config FB_AU1100
 
 source "drivers/video/geode/Kconfig"
 
-config FB_SBUS
-        bool "SBUS and UPA framebuffers"
-        depends on (FB = y) && (SPARC32 || SPARC64)
-        help
-          Say Y if you want support for SBUS or UPA based frame buffer device.
-
 config FB_FFB
         bool "Creator/Creator3D/Elite3D support"
         depends on FB_SBUS && SPARC64
@@ -1267,7 +1268,7 @@ config FB_LEO
 
 config FB_PCI
         bool "PCI framebuffers"
-        depends on (FB = y) && PCI && (SPARC64 || SPARC32)
+        depends on (FB = y) && PCI && SPARC
 
 config FB_IGA
         bool "IGA 168x display support"