diff options
| author | Ben Warren <biggerbadderben@gmail.com> | 2008-08-31 10:44:19 -0700 |
|---|---|---|
| committer | Ben Warren <biggerbadderben@gmail.com> | 2008-09-02 21:18:18 -0700 |
| commit | ad3381cf4167120db5c7b88e4970245e1d5c0a32 (patch) | |
| tree | 93a19cb4ee835e33553e591c9c55c11cb3763548 /include/netdev.h | |
| parent | 4fce2aceaf8afd31a252bc782c9dbc497bf40487 (diff) | |
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 'include/netdev.h')
| -rw-r--r-- | include/netdev.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/netdev.h b/include/netdev.h index 1013a803a..fa4d92d75 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -42,6 +42,7 @@ int cpu_eth_init(bd_t *bis); /* Driver initialization prototypes */ int bfin_EMAC_initialize(bd_t *bis); +int e1000_initialize(bd_t *bis); int eth_3com_initialize (bd_t * bis); int greth_initialize(bd_t *bis); void gt6426x_eth_initialize(bd_t *bis); @@ -69,6 +70,9 @@ static inline int pci_eth_init(bd_t *bis) { int num = 0; +#ifdef CONFIG_E1000 + num += e1000_initialize(bis); +#endif #ifdef CONFIG_PCNET num += pcnet_initialize(bis); #endif |