From: Wolfgang Denk <wd@denx.de>
Date: Wed, 23 Jan 2008 13:33:40 +0000 (+0100)
Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-avr32
X-Git-Tag: v1.3.2-rc1~65^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8d54477b9bfc666632e767946ea190fc6ce52775;p=oweals%2Fu-boot.git

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

8d54477b9bfc666632e767946ea190fc6ce52775
diff --cc net/eth.c
index 4a9e1e691b,f707971753..75175ec62b
--- a/net/eth.c
+++ 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);