Merge git://www.denx.de/git/u-boot

Conflicts:

	drivers/Makefile
This commit is contained in:
Nobuhiro Iwamatsu
2007-12-07 01:20:16 +09:00
295 changed files with 2826 additions and 1177 deletions
+1 -1
View File
@@ -29,7 +29,7 @@
#include <common.h>
#include <exports.h>
#include "../drivers/smc91111.h"
#include "../drivers/net/smc91111.h"
#define SMC_BASE_ADDRESS CONFIG_SMC91111_BASE
#define EEPROM 0x1;