Merge branch 'linux-2.6'

[linux-2.6-omap-h63xx.git] / arch / powerpc / sysdev / cpm2_common.c

diff --git a/arch/powerpc/sysdev/cpm2_common.c b/arch/powerpc/sysdev/cpm2_common.c
index 0a7054579d9892c92db58cd1422c927bcb81ba63..f7188e2ba6696e21197dfbb5c9794f44306a8876 100644 (file)
--- a/arch/powerpc/sysdev/cpm2_common.c
+++ b/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);