From: Markus Klotzbuecher <mk@denx.de>
Date: Wed, 9 Jan 2008 12:57:10 +0000 (+0100)
Subject: Merge git://www.denx.de/git/u-boot
X-Git-Tag: v1.3.2-rc1~102^2~41^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a40ef62c4300e9f606deef0a4618cbc4b514a51;p=pandora-u-boot.git

Merge git://www.denx.de/git/u-boot

Conflicts:

	board/tqm5200/tqm5200.c
---

6a40ef62c4300e9f606deef0a4618cbc4b514a51
diff --cc board/tqm5200/tqm5200.c
index da4e2281a7f,f33d17258de..905a04338e7
--- a/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 */