diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-20 12:10:29 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-20 12:10:29 +0100 |
| commit | 124ba9403318d834ef21bcd899c22c870708d2c4 (patch) | |
| tree | 2ac84214085de8780dfa565be7e3ef0d675f6a68 /drivers/oprofile | |
| parent | 74eec26facadbe6dbc0621bc862892c915c4534f (diff) | |
| parent | dd3c4670d7fafeb18bf7542fbcfd2606fb06a4a1 (diff) | |
| download | kernel-common-124ba9403318d834ef21bcd899c22c870708d2c4.tar.gz kernel-common-124ba9403318d834ef21bcd899c22c870708d2c4.tar.bz2 kernel-common-124ba9403318d834ef21bcd899c22c870708d2c4.zip | |
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.h | 1 |
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 |