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-marvell
[platform/kernel/u-boot.git]
/
board
/
Marvell
/
sheevaplug
/
sheevaplug.c
diff --git
a/board/Marvell/sheevaplug/sheevaplug.c
b/board/Marvell/sheevaplug/sheevaplug.c
index
173a7b8
..
d7dc80c
100644
(file)
--- a/
board/Marvell/sheevaplug/sheevaplug.c
+++ b/
board/Marvell/sheevaplug/sheevaplug.c
@@
-30,7
+30,7
@@
DECLARE_GLOBAL_DATA_PTR;
-int board_
init
(void)
+int board_
early_init_f
(void)
{
/*
* default gpio configuration
@@
-96,7
+96,11
@@
int board_init(void)
0
};
kirkwood_mpp_conf(kwmpp_config);
+ return 0;
+}
+int board_init(void)
+{
/*
* arch number of board
*/