From: Jean-Christophe PLAGNIOL-VILLARD Date: Sat, 24 May 2008 10:56:53 +0000 (+0200) Subject: Merging Stelian Pop AT91 patches X-Git-Tag: v1.3.4-rc1~114^2~22^2~1 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=42fd5f87b1613d3039f57e93c16f760a768d3e84;p=u-boot Merging Stelian Pop AT91 patches Merge branch 'testing-V2' Conflicts: board/atmel/at91cap9adk/Makefile Fixing copyright board/atmel/at91sam9260ek/Makefile Fixing copyright board/atmel/at91sam9260ek/u-boot.lds Delete no more needed ld script Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- 42fd5f87b1613d3039f57e93c16f760a768d3e84 diff --cc drivers/video/Makefile index 9d2f65b7f8,a07ee0ecaf..20a54c54df --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@@ -23,9 -23,10 +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