diff options
| author | Jon Loeliger <jdl@freescale.com> | 2006-06-07 08:49:38 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2006-06-07 08:49:38 -0500 |
| commit | 72ed528a948b151e7be5ce03ed3d2b88a229dd0a (patch) | |
| tree | 0f90590c0faf6fcc85f26f92facc653112be53e0 /net | |
| parent | 9f37dc8cabc94aed27aec8b4c69a390c8603fd28 (diff) | |
| parent | e461a24113c66747510b07930a83b0d84171a559 (diff) | |
| download | blackbird-obmc-uboot-72ed528a948b151e7be5ce03ed3d2b88a229dd0a.tar.gz blackbird-obmc-uboot-72ed528a948b151e7be5ce03ed3d2b88a229dd0a.zip | |
Merge branch 'master' of http://www.denx.de/git/u-boot
Diffstat (limited to 'net')
| -rw-r--r-- | net/eth.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -53,6 +53,7 @@ extern int rtl8169_initialize(bd_t*); extern int scc_initialize(bd_t*); extern int skge_initialize(bd_t*); extern int tsec_initialize(bd_t*, int, char *); +extern int npe_initialize(bd_t *); static struct eth_device *eth_devices, *eth_current; @@ -217,6 +218,9 @@ int eth_initialize(bd_t *bis) #if defined(CONFIG_AU1X00) au1x00_enet_initialize(bis); #endif +#if defined(CONFIG_IXP4XX_NPE) + npe_initialize(bis); +#endif #ifdef CONFIG_E1000 e1000_initialize(bis); #endif |
