summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-04-08 00:16:36 +0200
committerWolfgang Denk <wd@denx.de>2008-04-08 00:16:36 +0200
commita1b215e2a2a013327693f2fb990957b746f26cf5 (patch)
treec998a43b8022f623ac86a0de246d05ed36a86e9e /net
parentf9eabcb357ea294e3e01bfe26841bf51d6bd8f05 (diff)
parentb5873f1732b92a25690e1513b90dfb0d644f6697 (diff)
downloadbootable_bootloader_goldelico_gta04-a1b215e2a2a013327693f2fb990957b746f26cf5.zip
bootable_bootloader_goldelico_gta04-a1b215e2a2a013327693f2fb990957b746f26cf5.tar.gz
bootable_bootloader_goldelico_gta04-a1b215e2a2a013327693f2fb990957b746f26cf5.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-at91
Diffstat (limited to 'net')
-rw-r--r--net/eth.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/eth.c b/net/eth.c
index 3b86f87..c4f24c6 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -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) {