diff --git a/[refs] b/[refs] index 7e7e936f4866..ca693b8e43fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9773be5f5fcbabb688bf05f85d594261a53a5ac0 +refs/heads/master: c05793c7332d0f4179068bc6a6120e67b73a09ef diff --git a/trunk/arch/m68k/platform/532x/config.c b/trunk/arch/m68k/platform/532x/config.c index 8c0dd5caae97..56b21fd84b3f 100644 --- a/trunk/arch/m68k/platform/532x/config.c +++ b/trunk/arch/m68k/platform/532x/config.c @@ -83,6 +83,12 @@ void __init config_BSP(char *commandp, int size) #endif mach_sched_init = hw_timer_init; + mach_reset = m532x_cpu_reset; + m532x_uarts_init(); + m532x_fec_init(); +#ifdef CONFIG_SPI_COLDFIRE_QSPI + m532x_qspi_init(); +#endif #ifdef CONFIG_BDM_DISABLE /* @@ -94,20 +100,6 @@ void __init config_BSP(char *commandp, int size) #endif } -/***************************************************************************/ - -static int __init init_BSP(void) -{ - m532x_uarts_init(); - m532x_fec_init(); -#ifdef CONFIG_SPI_COLDFIRE_QSPI - m532x_qspi_init(); -#endif - return 0; -} - -arch_initcall(init_BSP); - /***************************************************************************/ /* Board initialization */ /***************************************************************************/