diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2007-11-20 08:19:56 -0700 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2007-11-20 08:19:56 -0700 |
commit | f92edbd8a0ef16a2b9127cbb564c09685728e4b0 (patch) | |
tree | ae33aacff092561e2c64eabc11a8adc5e2acea6b /board/tqm5200/tqm5200.c | |
parent | efe33035acd5f7c13963a4d52e5aac1b68612ae4 (diff) | |
parent | 9a337ddc154a10a26f117fd147b009abcdeba75a (diff) | |
download | u-boot-imx-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.zip u-boot-imx-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.tar.gz u-boot-imx-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.tar.bz2 |
Merge branch 'origin' into kconfig-for-1.3.1
Diffstat (limited to 'board/tqm5200/tqm5200.c')
-rw-r--r-- | board/tqm5200/tqm5200.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/board/tqm5200/tqm5200.c b/board/tqm5200/tqm5200.c index da4e228..f33d172 100644 --- a/board/tqm5200/tqm5200.c +++ b/board/tqm5200/tqm5200.c @@ -444,6 +444,8 @@ 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 */ @@ -591,9 +593,9 @@ int last_stage_init (void) disable_ctrlc(1); } #endif +#endif /* !CONFIG_TQM5200S */ return 0; -#endif /* !CONFIG_TQM5200S */ } #ifdef CONFIG_VIDEO_SM501 |