vserver 2.0 rc7

[linux-2.6.git] / drivers / video / console / Makefile

diff --git a/drivers/video/console/Makefile b/drivers/video/console/Makefile
index e5fa93b..3351644 100644 (file)
--- a/drivers/video/console/Makefile
+++ b/drivers/video/console/Makefile
@@ -21,13 +21,15 @@ font-objs += $(font-objs-y)
 obj-$(CONFIG_DUMMY_CONSOLE)       += dummycon.o
 obj-$(CONFIG_SGI_NEWPORT_CONSOLE) += newport_con.o font.o
 obj-$(CONFIG_PROM_CONSOLE)        += promcon.o promcon_tbl.o
-obj-$(CONFIG_STI_CONSOLE)         += sticon.o sticore.o
+obj-$(CONFIG_STI_CONSOLE)         += sticon.o sticore.o font.o
 obj-$(CONFIG_VGA_CONSOLE)         += vgacon.o
 obj-$(CONFIG_MDA_CONSOLE)         += mdacon.o
 obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += fbcon.o bitblit.o font.o
-obj-$(CONFIG_FB_TILEBLITTING)     += tileblit.o
+ifeq ($(CONFIG_FB_TILEBLITTING),y)
+obj-$(CONFIG_FRAMEBUFFER_CONSOLE)     += tileblit.o
+endif
 
-obj-$(CONFIG_FB_STI)              += sticore.o
+obj-$(CONFIG_FB_STI)              += sticore.o font.o
 
 # Targets that kbuild needs to know about
 targets := promcon_tbl.c
@@ -37,5 +39,5 @@ quiet_cmd_conmakehash = CNMKHSH $@
                sed -e '/\#include <[^>]*>/p' -e 's/types/init/' \
                -e 's/dfont\(_uni.*\]\)/promfont\1 __initdata/' > $@
 
-$(obj)/promcon_tbl.c: $(src)/prom.uni FORCE
-       $(call if_changed,conmakehash)
+$(obj)/promcon_tbl.c: $(src)/prom.uni
+       $(call cmd,conmakehash)