dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 16:52:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'u-boot/master' into 'u-boot-arm/master'

Browse Source 
Conflicts:
	common/cmd_fpga.c
	drivers/usb/host/ohci-at91.c
This commit is contained in:
Albert ARIBAUD
2013-05-30 14:45:06 +02:00
parent 60985bba58 a71d45d706
commit a19b0dd62d
305 changed files with 8284 additions and 15437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/netdev.h
View File

@@ -77,7 +77,6 @@ int mcdmafec_initialize(bd_t *bis);
int mcffec_initialize(bd_t *bis);
int mpc512x_fec_initialize(bd_t *bis);
int mpc5xxx_fec_initialize(bd_t *bis);
int mpc8220_fec_initialize(bd_t *bis);
int mpc82xx_scc_enet_initialize(bd_t *bis);
int mvgbe_initialize(bd_t *bis);
int natsemi_initialize(bd_t *bis);