diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-02-03 20:10:20 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-02-03 20:10:20 +0100 |
| commit | 05c2f4fe2966daa960017a48a506328d01b0a089 (patch) | |
| tree | b16577fabe03a57b0948551b6e4e664da61f17c0 /cpu | |
| parent | 5c1a1a3069c194ac6509344e58f8c96779d2d197 (diff) | |
| parent | c041e9d212162f6c85cd3b6a40ad6ba9d9292451 (diff) | |
| download | u-boot-imx-05c2f4fe2966daa960017a48a506328d01b0a089.zip u-boot-imx-05c2f4fe2966daa960017a48a506328d01b0a089.tar.gz u-boot-imx-05c2f4fe2966daa960017a48a506328d01b0a089.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/arm920t/at91rm9200/bcm5221.c | 4 | ||||
| -rw-r--r-- | cpu/arm920t/at91rm9200/dm9161.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/cpu/arm920t/at91rm9200/bcm5221.c b/cpu/arm920t/at91rm9200/bcm5221.c index b52c615..8de3cba 100644 --- a/cpu/arm920t/at91rm9200/bcm5221.c +++ b/cpu/arm920t/at91rm9200/bcm5221.c @@ -28,10 +28,10 @@ #include <at91rm9200_net.h> #include <net.h> -#include <bcm5221.h> - #ifdef CONFIG_DRIVER_ETHER +#include <bcm5221.h> + #if defined(CONFIG_CMD_NET) /* 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) |