Merge git://www.denx.de/git/u-boot
Conflicts: drivers/Makefile
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user