From 3950fa995ad267957490209e05bd36dee44aff49 Mon Sep 17 00:00:00 2001
From: Scott Wood <scottwood@freescale.com>
Date: Wed, 12 Dec 2007 16:54:32 -0600
Subject: [PATCH] --- yaml --- r: 74861 b: refs/heads/master c:
 cd2150bca97822609fabbb77063a1a20149f5657 h: refs/heads/master i:   74859:
 ab6c4a53e8b12a39415ea9d2186923c64b3ddda9 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/powerpc/sysdev/cpm2_common.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8583aaf26392..cce6f4657790 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ac68d379e73e469b62149ee2dcc19547d3d992c
+refs/heads/master: cd2150bca97822609fabbb77063a1a20149f5657
diff --git a/trunk/arch/powerpc/sysdev/cpm2_common.c b/trunk/arch/powerpc/sysdev/cpm2_common.c
index 859362fecb7c..c1d824032020 100644
--- a/trunk/arch/powerpc/sysdev/cpm2_common.c
+++ b/trunk/arch/powerpc/sysdev/cpm2_common.c
@@ -61,8 +61,7 @@ cpm2_map_t __iomem *cpm2_immr;
 					   of space for CPM as it is larger
 					   than on PQ2 */
 
-void
-cpm2_reset(void)
+void __init cpm2_reset(void)
 {
 #ifdef CONFIG_PPC_85xx
 	cpm2_immr = ioremap(CPM_MAP_ADDR, CPM_MAP_SIZE);