diff options
author | Mark Fortescue <mark@mtfhpc.demon.co.uk> | 2005-11-29 22:34:44 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-29 22:47:04 -0500 |
commit | 1a57198609615a936ff57da37b6957db9bafde83 (patch) | |
tree | baf0ddace16f0650698166d73e744d01d789142d /drivers | |
parent | 49d5c7b08713c3a482d62b5a0ad41b4ec32905a5 (diff) |
[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')
-rw-r--r-- | drivers/video/Kconfig | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 25b6ca6ad081..3e470c8b4193 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -534,6 +534,12 @@ config FB_SUN3 | |||
534 | bool "Sun3 framebuffer support" | 534 | bool "Sun3 framebuffer support" |
535 | depends on (FB = y) && (SUN3 || SUN3X) && BROKEN | 535 | depends on (FB = y) && (SUN3 || SUN3X) && BROKEN |
536 | 536 | ||
537 | config FB_SBUS | ||
538 | bool "SBUS and UPA framebuffers" | ||
539 | depends on (FB = y) && (SPARC32 || SPARC64) | ||
540 | help | ||
541 | Say Y if you want support for SBUS or UPA based frame buffer device. | ||
542 | |||
537 | config FB_BW2 | 543 | config FB_BW2 |
538 | bool "BWtwo support" | 544 | bool "BWtwo support" |
539 | depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3) | 545 | depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3) |
@@ -546,6 +552,7 @@ config FB_BW2 | |||
546 | config FB_CG3 | 552 | config FB_CG3 |
547 | bool "CGthree support" | 553 | bool "CGthree support" |
548 | depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3) | 554 | depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3) |
555 | select FB_CFB_FILLRECT | ||
549 | select FB_CFB_COPYAREA | 556 | select FB_CFB_COPYAREA |
550 | select FB_CFB_IMAGEBLIT | 557 | select FB_CFB_IMAGEBLIT |
551 | help | 558 | help |
@@ -1210,12 +1217,6 @@ config FB_AU1100 | |||
1210 | 1217 | ||
1211 | source "drivers/video/geode/Kconfig" | 1218 | source "drivers/video/geode/Kconfig" |
1212 | 1219 | ||
1213 | config FB_SBUS | ||
1214 | bool "SBUS and UPA framebuffers" | ||
1215 | depends on (FB = y) && (SPARC32 || SPARC64) | ||
1216 | help | ||
1217 | Say Y if you want support for SBUS or UPA based frame buffer device. | ||
1218 | |||
1219 | config FB_FFB | 1220 | config FB_FFB |
1220 | bool "Creator/Creator3D/Elite3D support" | 1221 | bool "Creator/Creator3D/Elite3D support" |
1221 | depends on FB_SBUS && SPARC64 | 1222 | depends on FB_SBUS && SPARC64 |