summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorBen Warren <biggerbadderben@gmail.com>2008-08-31 10:44:19 -0700
committerBen Warren <biggerbadderben@gmail.com>2008-09-02 21:18:18 -0700
commitad3381cf4167120db5c7b88e4970245e1d5c0a32 (patch)
tree93a19cb4ee835e33553e591c9c55c11cb3763548 /drivers/net
parent4fce2aceaf8afd31a252bc782c9dbc497bf40487 (diff)
downloadu-boot-imx-ad3381cf4167120db5c7b88e4970245e1d5c0a32.zip
u-boot-imx-ad3381cf4167120db5c7b88e4970245e1d5c0a32.tar.gz
u-boot-imx-ad3381cf4167120db5c7b88e4970245e1d5c0a32.tar.bz2
Moved initialization of E1000 Ethernet controller to board_eth_init()
Affected boards: ap1000 mvbc_p PM854 Removed initialization of the driver from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/e1000.c2
-rw-r--r--drivers/net/e1000.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index c8b4e98..2dcaa2c 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -3059,5 +3059,5 @@ e1000_initialize(bd_t * bis)
card_number++;
}
- return 1;
+ return card_number;
}
diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h
index c258bc2..08042a8 100644
--- a/drivers/net/e1000.h
+++ b/drivers/net/e1000.h
@@ -36,6 +36,7 @@
#include <common.h>
#include <malloc.h>
#include <net.h>
+#include <netdev.h>
#include <asm/io.h>
#include <pci.h>