diff options
author | Stefan Roese <sr@denx.de> | 2008-07-07 09:51:25 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2008-07-07 09:51:25 +0200 |
commit | 7c6237b3e2f2ee0098897da39b79aff4642b8946 (patch) | |
tree | d768b7851bb688f543da0a3ed50c927a2bde2804 /board/amirix/ap1000 | |
parent | dd1c5523d6f44e842e69f2fcb50788c6060eab86 (diff) | |
parent | c956717ab25c962ef49d49064dfc73f4edcba1fb (diff) | |
download | u-boot-imx-7c6237b3e2f2ee0098897da39b79aff4642b8946.zip u-boot-imx-7c6237b3e2f2ee0098897da39b79aff4642b8946.tar.gz u-boot-imx-7c6237b3e2f2ee0098897da39b79aff4642b8946.tar.bz2 |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'board/amirix/ap1000')
-rw-r--r-- | board/amirix/ap1000/Makefile | 2 | ||||
-rw-r--r-- | board/amirix/ap1000/serial.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/board/amirix/ap1000/Makefile b/board/amirix/ap1000/Makefile index 7b99d31..d072934 100644 --- a/board/amirix/ap1000/Makefile +++ b/board/amirix/ap1000/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 ######################################################################### diff --git a/board/amirix/ap1000/serial.c b/board/amirix/ap1000/serial.c index 811f1aa..508e880 100644 --- a/board/amirix/ap1000/serial.c +++ b/board/amirix/ap1000/serial.c @@ -19,10 +19,9 @@ * */ -#include <asm/types.h> +#include <common.h> #include <asm/u-boot.h> #include <asm/processor.h> -#include <common.h> #include <command.h> #include <config.h> |