Merge branch 'master' into next

[u-boot] / cpu / i386 / Makefile

diff --git a/cpu/i386/Makefile b/cpu/i386/Makefile
index f20675af19c86c16ab426ef691027992b4b25f21..c658c6e45919213ddb576f5898744b2c7453c921 100644 (file)
--- a/cpu/i386/Makefile
+++ b/cpu/i386/Makefile
@@ -29,8 +29,7 @@ include $(TOPDIR)/config.mk
 LIB    = $(obj)lib$(CPU).a
 
 START  = start.o start16.o resetvec.o
-COBJS  = serial.o interrupts.o cpu.o timer.o sc520.o
-SOBJS  = sc520_asm.o
+COBJS  = serial.o interrupts.o cpu.o
 
 SRCS   := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))