summaryrefslogtreecommitdiff
path: root/board/trizepsiv
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-07-06 01:15:17 +0200
committerWolfgang Denk <wd@denx.de>2008-07-06 01:15:17 +0200
commitd86a0a6f7fe433787edf06aecba9fd6abfecab48 (patch)
tree005ba8a000e7bdcab42c1df6339bf7e51dcda2ca /board/trizepsiv
parenta524e112b424c6843800ea2f19d3a8cf01d0aa94 (diff)
parentf492dd636fbbae529e17533995bc6e5813c007f6 (diff)
downloadu-boot-imx-d86a0a6f7fe433787edf06aecba9fd6abfecab48.zip
u-boot-imx-d86a0a6f7fe433787edf06aecba9fd6abfecab48.tar.gz
u-boot-imx-d86a0a6f7fe433787edf06aecba9fd6abfecab48.tar.bz2
Merge branch 'master' of ssh+git://mercury.denx.de/home/wd/git/u-boot/master
Conflicts: board/amirix/ap1000/serial.c board/exbitgen/exbitgen.c board/exbitgen/flash.c board/ml2/serial.c board/xilinx/ml300/serial.c Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/trizepsiv')
-rw-r--r--board/trizepsiv/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/trizepsiv/Makefile b/board/trizepsiv/Makefile
index 115e17d..44c0d49 100644
--- a/board/trizepsiv/Makefile
+++ b/board/trizepsiv/Makefile
@@ -39,7 +39,7 @@ clean:
rm -f $(SOBJS) $(OBJS)
distclean: clean
- rm -f $(LIB) core *.bak .depend
+ rm -f $(LIB) core *.bak $(obj).depend
#########################################################################