Merge branch 'linus' into core/urgent

[linux-2.6-omap-h63xx.git] / arch / powerpc / oprofile / op_model_power4.c

diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c
index 446a8bbb847b0f2dcd679ac74eaece531cee4476..3e3d91f536e0be0daa3a1b7e031023de475ea5a3 100644 (file)
--- a/arch/powerpc/oprofile/op_model_power4.c
+++ b/arch/powerpc/oprofile/op_model_power4.c
@@ -64,7 +64,7 @@ static int power4_reg_setup(struct op_counter_config *ctr,
        return 0;
 }
 
-extern void ppc64_enable_pmcs(void);
+extern void ppc_enable_pmcs(void);
 
 /*
  * Older CPUs require the MMCRA sample bit to be always set, but newer 
@@ -91,7 +91,7 @@ static int power4_cpu_setup(struct op_counter_config *ctr)
        unsigned int mmcr0 = mmcr0_val;
        unsigned long mmcra = mmcra_val;
 
-       ppc64_enable_pmcs();
+       ppc_enable_pmcs();
 
        /* set the freeze bit */
        mmcr0 |= MMCR0_FC;