diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2010-03-15 10:51:36 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2010-03-15 10:51:36 +0900 |
| commit | 995a4b1d83a08223c82c1e15778b02e85e5bba51 (patch) | |
| tree | 0acb85278216df76d8fb7284b32d6dd95a1fc978 /cpu/arm920t/at91rm9200/dm9161.c | |
| parent | a8d25fc26f681a9c4dfb062ebb4b00b9509a7966 (diff) | |
| parent | 44de3e8ff7ed48bf96ec6c5e2173187d9c1c61e6 (diff) | |
| download | u-boot-imx-995a4b1d83a08223c82c1e15778b02e85e5bba51.zip u-boot-imx-995a4b1d83a08223c82c1e15778b02e85e5bba51.tar.gz u-boot-imx-995a4b1d83a08223c82c1e15778b02e85e5bba51.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
board/davinci/da830evm/da830evm.c
board/edb93xx/sdram_cfg.c
board/esd/otc570/otc570.c
board/netstar/eeprom.c
board/netstar/eeprom_start.S
cpu/arm920t/ep93xx/timer.c
include/configs/netstar.h
include/configs/otc570.h
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'cpu/arm920t/at91rm9200/dm9161.c')
| -rw-r--r-- | cpu/arm920t/at91rm9200/dm9161.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpu/arm920t/at91rm9200/dm9161.c b/cpu/arm920t/at91rm9200/dm9161.c index 1beb6e8..6d4384f 100644 --- a/cpu/arm920t/at91rm9200/dm9161.c +++ b/cpu/arm920t/at91rm9200/dm9161.c @@ -23,9 +23,8 @@ #include <at91rm9200_net.h> #include <net.h> -#include <dm9161.h> - #ifdef CONFIG_DRIVER_ETHER +#include <dm9161.h> #if defined(CONFIG_CMD_NET) |