diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-08-20 09:37:09 +0200 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-08-20 09:37:09 +0200 |
| commit | d3c23a790fb24f9cb5cc467b81b0c3ad3eeb1f96 (patch) | |
| tree | 605af42f8834ea0b793e7febe4aba5d899e5f160 /board/atmel/atstk1000/Makefile | |
| parent | fcd69a1a57fb2af4d26201422095a4be9f36963e (diff) | |
| parent | 33eac2b3d946fc998a09245dfe54d017079b9056 (diff) | |
| download | u-boot-d3c23a790fb24f9cb5cc467b81b0c3ad3eeb1f96.tar.gz u-boot-d3c23a790fb24f9cb5cc467b81b0c3ad3eeb1f96.tar.xz u-boot-d3c23a790fb24f9cb5cc467b81b0c3ad3eeb1f96.zip | |
Merge branch 'next' of git://git.denx.de/u-boot-avr32
Conflicts:
MAINTAINERS
Diffstat (limited to 'board/atmel/atstk1000/Makefile')
| -rw-r--r-- | board/atmel/atstk1000/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/atmel/atstk1000/Makefile b/board/atmel/atstk1000/Makefile index 8a15713cc4..155d46ac97 100644 --- a/board/atmel/atstk1000/Makefile +++ b/board/atmel/atstk1000/Makefile @@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk LIB := $(obj)lib$(BOARD).a -COBJS := $(BOARD).o flash.o eth.o +COBJS := $(BOARD).o flash.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) |