summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-05-24 12:56:53 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-05-24 12:56:53 +0200
commit42fd5f87b1613d3039f57e93c16f760a768d3e84 (patch)
tree9dd0252fca37dbdb1148ce7fd44dc5c9dd8a6b34 /net
parent2c8d41969b47eb0b973912830c58689b2ba0e50a (diff)
parent54694a91428f6c3280fe1ee0923488a1e7e8dbc4 (diff)
Merging Stelian Pop AT91 patches
Merge branch 'testing-V2' Conflicts: board/atmel/at91cap9adk/Makefile Fixing copyright board/atmel/at91sam9260ek/Makefile Fixing copyright board/atmel/at91sam9260ek/u-boot.lds Delete no more needed ld script Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'net')
-rw-r--r--net/eth.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/eth.c b/net/eth.c
index c4f24c64b6..21d14961cb 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -288,7 +288,8 @@ int eth_initialize(bd_t *bis)
#if defined(CONFIG_FSLDMAFEC)
mcdmafec_initialize(bis);
#endif
-#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260)
+#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
+ defined(CONFIG_AT91SAM9263)
at91sam9_eth_initialize(bis);
#endif