diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-08-20 09:37:09 +0200 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-08-20 09:37:09 +0200 |
| commit | d3c23a790fb24f9cb5cc467b81b0c3ad3eeb1f96 (patch) | |
| tree | 605af42f8834ea0b793e7febe4aba5d899e5f160 /net/eth.c | |
| parent | fcd69a1a57fb2af4d26201422095a4be9f36963e (diff) | |
| parent | 33eac2b3d946fc998a09245dfe54d017079b9056 (diff) | |
| download | u-boot-imx-d3c23a790fb24f9cb5cc467b81b0c3ad3eeb1f96.zip u-boot-imx-d3c23a790fb24f9cb5cc467b81b0c3ad3eeb1f96.tar.gz u-boot-imx-d3c23a790fb24f9cb5cc467b81b0c3ad3eeb1f96.tar.bz2 | |
Merge branch 'next' of git://git.denx.de/u-boot-avr32
Conflicts:
MAINTAINERS
Diffstat (limited to 'net/eth.c')
| -rw-r--r-- | net/eth.c | 8 |
1 files changed, 0 insertions, 8 deletions
@@ -69,9 +69,7 @@ extern int uli526x_initialize(bd_t *); extern int npe_initialize(bd_t *); extern int uec_initialize(int); extern int bfin_EMAC_initialize(bd_t *); -extern int atstk1000_eth_initialize(bd_t *); extern int greth_initialize(bd_t *); -extern int atngw100_eth_initialize(bd_t *); extern int mcffec_initialize(bd_t*); extern int mcdmafec_initialize(bd_t*); extern int at91sam9_eth_initialize(bd_t *); @@ -271,15 +269,9 @@ int eth_initialize(bd_t *bis) #if defined(CONFIG_BF537) bfin_EMAC_initialize(bis); #endif -#if defined(CONFIG_ATSTK1000) - atstk1000_eth_initialize(bis); -#endif #if defined(CONFIG_GRETH) greth_initialize(bis); #endif -#if defined(CONFIG_ATNGW100) - atngw100_eth_initialize(bis); -#endif #if defined(CONFIG_MCFFEC) mcffec_initialize(bis); #endif |