diff options
| author | Ben Warren <biggerbadderben@gmail.com> | 2008-08-31 20:37:00 -0700 |
|---|---|---|
| committer | Ben Warren <biggerbadderben@gmail.com> | 2008-09-02 21:18:19 -0700 |
| commit | 10efa024b8ffd9e6aaca63da8bddfdffdc672274 (patch) | |
| tree | 77af62cc6ff60d614d605a5bdaa5015d4e710c35 /include | |
| parent | 8ca0b3f99c4fce7a599dcaf92ae095496dc8c8e0 (diff) | |
Moved initialization of EEPRO100 Ethernet controller to board_eth_init()
Affected boards:
db64360
db64460
katmai
taihu
taishan
yucca
cpc45
cpu87
eXalion
elppc
debris
kvme080
mpc8315erdb
integratorap
ixdp425
oxc
pm826
pm828
pm854
pm856
ppmc7xx
sc3
sc520_spunk
sorcery
tqm8272
tqm85xx
utx8245
Removed initialization of the driver from net/eth.c
Also, wrapped contents of pci_eth_init() by CONFIG_PCI.
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/netdev.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/netdev.h b/include/netdev.h index d8d1209dffb..8b181f77e11 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -44,6 +44,7 @@ int cpu_eth_init(bd_t *bis); int bfin_EMAC_initialize(bd_t *bis); int dc21x4x_initialize(bd_t *bis); int e1000_initialize(bd_t *bis); +int eepro100_initialize(bd_t *bis); int eth_3com_initialize (bd_t * bis); int greth_initialize(bd_t *bis); void gt6426x_eth_initialize(bd_t *bis); @@ -71,6 +72,11 @@ static inline int pci_eth_init(bd_t *bis) { int num = 0; +#ifdef CONFIG_PCI + +#ifdef CONFIG_EEPRO100 + num += eepro100_initialize(bis); +#endif #ifdef CONFIG_TULIP num += dc21x4x_initialize(bis); #endif @@ -95,6 +101,8 @@ static inline int pci_eth_init(bd_t *bis) #if defined(CONFIG_ULI526) num += uli526x_initialize(bis); #endif + +#endif /* CONFIG_PCI */ return num; } |