diff options
author | Wolfgang Denk <wd@denx.de> | 2009-12-05 01:11:59 (GMT) |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-12-05 01:11:59 (GMT) |
commit | 2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70 (patch) | |
tree | e19b3def6c8f41f56cdb5e8b71aa53d8f72f5812 /common/Makefile | |
parent | cd514aeb996e2f7aefbe1f78481965d9d074aed4 (diff) | |
parent | f68ab43de67f59925542efb6bcec30f4a84fe695 (diff) | |
download | u-boot-fsl-qoriq-2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70.tar.xz |
Merge branch 'master' into next
Conflicts:
board/esd/plu405/plu405.c
drivers/rtc/ftrtc010.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'common/Makefile')
-rw-r--r-- | common/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/common/Makefile b/common/Makefile index ec025ed..7784180 100644 --- a/common/Makefile +++ b/common/Makefile @@ -29,7 +29,6 @@ AOBJS = # core COBJS-y += main.o -COBJS-y += circbuf.o COBJS-y += console.o COBJS-y += command.o COBJS-y += dlmalloc.o |