diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-16 20:44:06 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-16 20:44:06 +0100 |
| commit | bb82de884005a869efeac4ae1b00891914d7c193 (patch) | |
| tree | 0831c96b9910686fcdaddc060baa6c392135e889 /api/Makefile | |
| parent | 0e62e0a72cba76205c93b6913b9ae267f8fe08dc (diff) | |
| parent | 9dfa8da709a1589d177d99c597d9b18d8c9a145d (diff) | |
| download | u-boot-imx-bb82de884005a869efeac4ae1b00891914d7c193.zip u-boot-imx-bb82de884005a869efeac4ae1b00891914d7c193.tar.gz u-boot-imx-bb82de884005a869efeac4ae1b00891914d7c193.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
* 'master' of /home/wd/git/u-boot/custodians:
api: export LCD device to external apps
font: split font data from video_font.h
tools: logo: split bmp arrays from bmp_logo.h
lcd: add clear and draw bitmap declaration
VIDEO: mx3fb: GCC4.6 fix build warnings
Powerpc/DIU: Fixed the 800x600 and 1024x768 resolution bug
Diffstat (limited to 'api/Makefile')
| -rw-r--r-- | api/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/api/Makefile b/api/Makefile index 2a64c4d..0e99f74 100644 --- a/api/Makefile +++ b/api/Makefile @@ -24,7 +24,8 @@ include $(TOPDIR)/config.mk LIB = $(obj)libapi.o -COBJS-$(CONFIG_API) += api.o api_net.o api_storage.o api_platform-$(ARCH).o +COBJS-$(CONFIG_API) += api.o api_display.o api_net.o api_storage.o \ + api_platform-$(ARCH).o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) |