summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorMark Fortescue <mark@mtfhpc.demon.co.uk>2005-11-29 19:34:44 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-29 19:47:04 -0800
commit1a57198609615a936ff57da37b6957db9bafde83 (patch)
treebaf0ddace16f0650698166d73e744d01d789142d /drivers/video
parent49d5c7b08713c3a482d62b5a0ad41b4ec32905a5 (diff)
downloadkernel-crypto-1a57198609615a936ff57da37b6957db9bafde83.tar.gz
kernel-crypto-1a57198609615a936ff57da37b6957db9bafde83.tar.xz
kernel-crypto-1a57198609615a936ff57da37b6957db9bafde83.zip
[PATCH] fbdev: cg3fb: Kconfig fix
A cut and past error regarding the CG3 frame buffer needs to be fixed. It also affects Creator/Creator3D/Elite3D. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/Kconfig13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 25b6ca6ad08..3e470c8b419 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -534,6 +534,12 @@ 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) && (SPARC32 || SPARC64)
+ 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)
@@ -546,6 +552,7 @@ config FB_BW2
config FB_CG3
bool "CGthree support"
depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3)
+ select FB_CFB_FILLRECT
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