summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorYoichi Yuasa2005-07-27 20:43:28 +0200
committerLinus Torvalds2005-07-28 01:25:48 +0200
commitb38817dda45bc2990a8d593f3a1b4d444b2dcf4f (patch)
tree1e787d4fb0a7a6e6d26ec2bfba00a1a4ff280047 /drivers
parent[PATCH] Really __nocast-annotate kmalloc_node() (diff)
downloadkernel-qcow2-linux-b38817dda45bc2990a8d593f3a1b4d444b2dcf4f.tar.gz
kernel-qcow2-linux-b38817dda45bc2990a8d593f3a1b4d444b2dcf4f.tar.xz
kernel-qcow2-linux-b38817dda45bc2990a8d593f3a1b4d444b2dcf4f.zip
[PATCH] mips: fbdev Kcofnig fix
arch/mips/Kconfig is defining CONFIG_FB as bool and drivers/video/Kconfig was changed a while ago to define it as tristate. Remove the MIPS definition. Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 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/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 04d3120f7236..cde0ed097af6 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1399,8 +1399,8 @@ config FB_TX3912
Say Y here to enable kernel support for the on-board framebuffer.
config FB_G364
- bool
- depends on MIPS_MAGNUM_4000 || OLIVETTI_M700
+ bool "G364 frame buffer support"
+ depends on (FB = y) && (MIPS_MAGNUM_4000 || OLIVETTI_M700)
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT