leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://www.denx.de/git/u-boot-at91

Browse Source
This commit is contained in:
Wolfgang Denk
2008-04-08 00:16:36 +02:00
parent f9eabcb357 b5873f1732
commit a1b215e2a2
54 changed files with 2492 additions and 995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/eth.c
View File

@@ -64,7 +64,7 @@ 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 at91cap9_eth_initialize(bd_t *);
extern int at91sam9_eth_initialize(bd_t *);
#ifdef CONFIG_API
extern void (*push_packet)(volatile void *, int);
@@ -288,8 +288,8 @@ int eth_initialize(bd_t *bis)
#if defined(CONFIG_FSLDMAFEC)
mcdmafec_initialize(bis);
#endif
#if defined(CONFIG_AT91CAP9)
at91cap9_eth_initialize(bis);
#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260)
at91sam9_eth_initialize(bis);
#endif
if (!eth_devices) {