Merge branch 'master'

1 files changed, 0 insertions, 33 deletions

diff --git a/arch/arm/oprofile/init.c b/arch/arm/oprofile/init.c
deleted file mode 100644
index d315a3a86c86..000000000000
--- a/arch/arm/oprofile/init.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * @file init.c
- *
- * @remark Copyright 2004 Oprofile Authors
- * @remark Read the file COPYING
- *
- * @author Zwane Mwaikambo
- */
-
-#include <linux/oprofile.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include "op_arm_model.h"
-
-int __init oprofile_arch_init(struct oprofile_operations *ops)
-{
-        int ret = -ENODEV;
-
-#ifdef CONFIG_CPU_XSCALE
-        ret = pmu_init(ops, &op_xscale_spec);
-#endif
-
-        ops->backtrace = arm_backtrace;
-
-        return ret;
-}
-
-void oprofile_arch_exit(void)
-{
-#ifdef CONFIG_CPU_XSCALE
-        pmu_exit();
-#endif
-}