git.openpandora.org
/
pandora-u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
245a362
07eb026
)
Merge git://www.denx.de/git/u-boot
author
Markus Klotzbuecher
<mk@denx.de>
Wed, 9 Jan 2008 12:57:10 +0000
(13:57 +0100)
committer
Markus Klotzbuecher
<mk@denx.de>
Wed, 9 Jan 2008 12:57:10 +0000
(13:57 +0100)
Conflicts:
board/tqm5200/tqm5200.c
1
2
board/tqm5200/tqm5200.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
board/tqm5200/tqm5200.c
index
da4e228
,
f33d172
..
905a043
---
1
/
board/tqm5200/tqm5200.c
---
2
/
board/tqm5200/tqm5200.c
+++ b/
board/tqm5200/tqm5200.c
@@@
-444,6
-444,8
+444,9
@@@
ulong post_word_load (void
#ifdef CONFIG_BOARD_EARLY_INIT_R
int board_early_init_r (void)
{
++
+ extern int usb_cpu_init(void);
+
#ifdef CONFIG_PS2MULT
ps2mult_early_init();
#endif /* CONFIG_PS2MULT */