summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-02-03 20:10:20 +0100
committerWolfgang Denk <wd@denx.de>2010-02-03 20:10:20 +0100
commit05c2f4fe2966daa960017a48a506328d01b0a089 (patch)
treeb16577fabe03a57b0948551b6e4e664da61f17c0 /cpu
parent5c1a1a3069c194ac6509344e58f8c96779d2d197 (diff)
parentc041e9d212162f6c85cd3b6a40ad6ba9d9292451 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'cpu')
-rw-r--r--cpu/arm920t/at91rm9200/bcm5221.c4
-rw-r--r--cpu/arm920t/at91rm9200/dm9161.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/cpu/arm920t/at91rm9200/bcm5221.c b/cpu/arm920t/at91rm9200/bcm5221.c
index b52c615864..8de3cba738 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 1beb6e8ba1..6d4384f41a 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)