summaryrefslogtreecommitdiff
path: root/drivers/oprofile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-12-20 12:10:29 +0100
committerIngo Molnar <mingo@elte.hu>2011-12-20 12:10:29 +0100
commit124ba9403318d834ef21bcd899c22c870708d2c4 (patch)
tree2ac84214085de8780dfa565be7e3ef0d675f6a68 /drivers/oprofile
parent74eec26facadbe6dbc0621bc862892c915c4534f (diff)
parentdd3c4670d7fafeb18bf7542fbcfd2606fb06a4a1 (diff)
downloadkernel-124ba9403318d834ef21bcd899c22c870708d2c4.tar.gz
Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core
Diffstat (limited to 'drivers/oprofile')
-rw-r--r--drivers/oprofile/oprof.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/oprofile/oprof.h b/drivers/oprofile/oprof.h
index 769fb0fcac44..d32ef816337c 100644
--- a/drivers/oprofile/oprof.h
+++ b/drivers/oprofile/oprof.h
@@ -35,7 +35,6 @@ struct dentry;
void oprofile_create_files(struct super_block *sb, struct dentry *root);
int oprofile_timer_init(struct oprofile_operations *ops);
-void oprofile_timer_exit(void);
#ifdef CONFIG_OPROFILE_NMI_TIMER
int op_nmi_timer_init(struct oprofile_operations *ops);
#else