]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://www.denx.de/git/u-boot-avr32
authorWolfgang Denk <wd@denx.de>
Wed, 23 Jan 2008 13:33:40 +0000 (14:33 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 23 Jan 2008 13:33:40 +0000 (14:33 +0100)
1  2 
MAINTAINERS
MAKEALL
Makefile
net/eth.c

diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc net/eth.c
index 4a9e1e691b50b5c50238f2d750f9a3141998d4da,f707971753a0c2889516c80f709674bc522513a8..75175ec62b90c8fc1d79f840dfe4c5b806ed256a
+++ b/net/eth.c
@@@ -60,8 -60,8 +60,9 @@@ 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 atngw100_eth_initialize(bd_t *);
  extern int mcffec_initialize(bd_t*);
 +extern int mcdmafec_initialize(bd_t*);
  
  #ifdef CONFIG_API
  extern void (*push_packet)(volatile void *, int);