From 16699a1765a16eba7b6476030b42ffea75d43d51 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Sat, 24 Dec 2011 13:06:33 +1000
Subject: [PATCH] --- yaml --- r: 292451 b: refs/heads/master c:
 c05793c7332d0f4179068bc6a6120e67b73a09ef h: refs/heads/master i:   292449:
 8611d14670389038e5f1a7fafbb4f18253c11324   292447:
 83f61b5f1b023fc796ef6bae559ce7665749826a v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/m68k/platform/532x/config.c | 20 ++++++--------------
 2 files changed, 7 insertions(+), 15 deletions(-)

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 */
 /***************************************************************************/