Merging Stelian Pop AT91 patches

[karo-tx-uboot.git] / drivers / video / Makefile

diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 0e40f2afa98811c10da5e683dbc976c6d1c10420..20a54c54dfa62bebc220bfccbedf04224f031ba1 100644 (file)
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -23,9 +23,10 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    := $(obj)libvideo.a
+LIB    := $(obj)libvideo.a
 
 COBJS-y += ati_radeon_fb.o
+COBJS-$(CONFIG_ATMEL_LCD) += atmel_lcdfb.o
 COBJS-y += cfb_console.o
 COBJS-y += ct69000.o
 COBJS-y += mb862xx.o
@@ -36,8 +37,8 @@ COBJS-y += smiLynxEM.o
 COBJS-y += videomodes.o
 
 COBJS  := $(COBJS-y)
-SRCS   := $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(COBJS))
+SRCS   := $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS))
 
 all:   $(LIB)