diff options
| author | Minkyu Kang <[email protected]> | 2010-03-15 10:51:36 +0900 |
|---|---|---|
| committer | Minkyu Kang <[email protected]> | 2010-03-15 10:51:36 +0900 |
| commit | 995a4b1d83a08223c82c1e15778b02e85e5bba51 (patch) | |
| tree | 0acb85278216df76d8fb7284b32d6dd95a1fc978 /examples | |
| parent | a8d25fc26f681a9c4dfb062ebb4b00b9509a7966 (diff) | |
| parent | 44de3e8ff7ed48bf96ec6c5e2173187d9c1c61e6 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
board/davinci/da830evm/da830evm.c
board/edb93xx/sdram_cfg.c
board/esd/otc570/otc570.c
board/netstar/eeprom.c
board/netstar/eeprom_start.S
cpu/arm920t/ep93xx/timer.c
include/configs/netstar.h
include/configs/otc570.h
Signed-off-by: Minkyu Kang <[email protected]>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/standalone/smc91111_eeprom.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/examples/standalone/smc91111_eeprom.c b/examples/standalone/smc91111_eeprom.c index 9145763e30c..b91f34c3af0 100644 --- a/examples/standalone/smc91111_eeprom.c +++ b/examples/standalone/smc91111_eeprom.c @@ -53,9 +53,8 @@ int smc91111_eeprom (int argc, char *argv[]) int c, i, j, done, line, reg, value, start, what; char input[50]; - struct eth_device dev = { - .iobase = CONFIG_SMC91111_BASE - }; + struct eth_device dev; + dev.iobase = CONFIG_SMC91111_BASE; /* Print the ABI version */ app_startup (argv); |