diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-29 22:03:00 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-29 22:03:00 +0200 |
| commit | 0c0892be0d93a5a892b93739c5eb3bf692fed4ff (patch) | |
| tree | a046b11024bdf0a41082647c95df23a10cb206fc /board/Marvell/sheevaplug/sheevaplug.c | |
| parent | d75c2a3d7f34ff1eb9920ad72483cff7cb6d358f (diff) | |
| parent | 28e57108a61bd0e554d9847170b8ad9dad093e07 (diff) | |
| download | u-boot-0c0892be0d93a5a892b93739c5eb3bf692fed4ff.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-marvell
Conflicts:
include/configs/km_arm.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/Marvell/sheevaplug/sheevaplug.c')
| -rw-r--r-- | board/Marvell/sheevaplug/sheevaplug.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c index 173a7b809d..d7dc80c1ba 100644 --- 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 */ |