tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by Mark Fortescue and committed by Linus Torvalds 1a571986 49d5c7b0

+7 -6
unified split
+7 -6
drivers/video/Kconfig
··· 534 bool "Sun3 framebuffer support" 535 depends on (FB = y) && (SUN3 || SUN3X) && BROKEN 536 537 config FB_BW2 538 bool "BWtwo support" 539 depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3) ··· 552 config FB_CG3 553 bool "CGthree support" 554 depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3) 555 select FB_CFB_COPYAREA 556 select FB_CFB_IMAGEBLIT 557 help ··· 1216 depends on (FB = y) && EXPERIMENTAL && PCI && MIPS && MIPS_PB1100=y 1217 1218 source "drivers/video/geode/Kconfig" 1219 - 1220 - config FB_SBUS 1221 - bool "SBUS and UPA framebuffers" 1222 - depends on (FB = y) && (SPARC32 || SPARC64) 1223 - help 1224 - Say Y if you want support for SBUS or UPA based frame buffer device. 1225 1226 config FB_FFB 1227 bool "Creator/Creator3D/Elite3D support"
··· 534 bool "Sun3 framebuffer support" 535 depends on (FB = y) && (SUN3 || SUN3X) && BROKEN 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 + 543 config FB_BW2 544 bool "BWtwo support" 545 depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3) ··· 546 config FB_CG3 547 bool "CGthree support" 548 depends on (FB = y) && ((SPARC32 || SPARC64) && FB_SBUS || (SUN3 || SUN3X) && FB_SUN3) 549 + select FB_CFB_FILLRECT 550 select FB_CFB_COPYAREA 551 select FB_CFB_IMAGEBLIT 552 help ··· 1209 depends on (FB = y) && EXPERIMENTAL && PCI && MIPS && MIPS_PB1100=y 1210 1211 source "drivers/video/geode/Kconfig" 1212 1213 config FB_FFB 1214 bool "Creator/Creator3D/Elite3D support"