diff options
author | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2007-12-07 01:20:16 +0900 |
---|---|---|
committer | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2007-12-07 01:20:16 +0900 |
commit | 521dcd30b9cc5b72cd27ae04104f19369251aa20 (patch) | |
tree | bc33710a3ae6f97f0dcae8f02fd6f3c91322d96d /examples | |
parent | 260eea5676ca46903a335686cc020b29c4ca46fe (diff) | |
parent | 8d4f040a3c15036a6ea25a9c39e7d89fefa8440d (diff) | |
download | u-boot-521dcd30b9cc5b72cd27ae04104f19369251aa20.tar.gz u-boot-521dcd30b9cc5b72cd27ae04104f19369251aa20.tar.bz2 u-boot-521dcd30b9cc5b72cd27ae04104f19369251aa20.zip |
Merge git://www.denx.de/git/u-boot
Conflicts:
drivers/Makefile
Diffstat (limited to 'examples')
-rw-r--r-- | examples/smc91111_eeprom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/smc91111_eeprom.c b/examples/smc91111_eeprom.c index 98e3e86ffa..b8a3594e9e 100644 --- a/examples/smc91111_eeprom.c +++ b/examples/smc91111_eeprom.c @@ -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; |