summaryrefslogtreecommitdiff
path: root/arch/arm/oprofile/op_arm_model.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-12-07 01:31:30 +0300
committerLen Brown <len.brown@intel.com>2005-12-07 01:31:30 +0300
commit3d5271f9883cba7b54762bc4fe027d4172f06db7 (patch)
treeab8a881a14478598a0c8bda0d26c62cdccfffd6d /arch/arm/oprofile/op_arm_model.h
parent378b2556f4e09fa6f87ff0cb5c4395ff28257d02 (diff)
parent9115a6c787596e687df03010d97fccc5e0762506 (diff)
downloadlinux-3d5271f9883cba7b54762bc4fe027d4172f06db7.tar.xz
Pull release into acpica branch
Diffstat (limited to 'arch/arm/oprofile/op_arm_model.h')
-rw-r--r--arch/arm/oprofile/op_arm_model.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/oprofile/op_arm_model.h b/arch/arm/oprofile/op_arm_model.h
index 2148d07484b7..38c6ad158547 100644
--- a/arch/arm/oprofile/op_arm_model.h
+++ b/arch/arm/oprofile/op_arm_model.h
@@ -26,6 +26,6 @@ extern struct op_arm_model_spec op_xscale_spec;
extern void arm_backtrace(struct pt_regs * const regs, unsigned int depth);
-extern int __init pmu_init(struct oprofile_operations *ops, struct op_arm_model_spec *spec);
-extern void pmu_exit(void);
+extern int __init op_arm_init(struct oprofile_operations *ops, struct op_arm_model_spec *spec);
+extern void op_arm_exit(void);
#endif /* OP_ARM_MODEL_H */