projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
[platform/kernel/u-boot.git]
/
board
/
ti
/
omap5_uevm
/
evm.c
diff --git
a/board/ti/omap5_uevm/evm.c
b/board/ti/omap5_uevm/evm.c
index
701842b
..
46db1bf
100644
(file)
--- a/
board/ti/omap5_uevm/evm.c
+++ b/
board/ti/omap5_uevm/evm.c
@@
-64,7
+64,7
@@
int board_eth_init(bd_t *bis)
int misc_init_r(void)
{
#ifdef CONFIG_PALMAS_POWER
-
twl6035
_init_settings();
+
palmas
_init_settings();
#endif
return 0;
}