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 rsync://rsync.denx.de/git/u-boot
[platform/kernel/u-boot.git]
/
board
/
esd
/
cpci2dp
/
cpci2dp.c
diff --git
a/board/esd/cpci2dp/cpci2dp.c
b/board/esd/cpci2dp/cpci2dp.c
index
1a27ca0
..
36bf329
100644
(file)
--- a/
board/esd/cpci2dp/cpci2dp.c
+++ b/
board/esd/cpci2dp/cpci2dp.c
@@
-26,6
+26,8
@@
#include <command.h>
#include <malloc.h>
+DECLARE_GLOBAL_DATA_PTR;
+
int board_early_init_f (void)
{
unsigned long cntrl0Reg;
@@
-74,7
+76,6
@@
int misc_init_f (void)
int misc_init_r (void)
{
- DECLARE_GLOBAL_DATA_PTR;
unsigned long cntrl0Reg;
/* adjust flash start and offset */