Merge branch 'master' into next

[u-boot] / common / Makefile

diff --git a/common/Makefile b/common/Makefile
index ec025eddd20db3fbc387635c1d4f532ede4c0338..778418086c41fe9d10cedbc8d81b02b0a7e930b1 100644 (file)
--- 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