diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-10-30 10:26:11 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-30 10:26:11 +0000 |
commit | 2231b3729eb92f163bbe64b604410ee451b2c42b (patch) | |
tree | 4b4043cda9bfcf0912839edbb64484763853bd33 /arch/arm/include | |
parent | b99053eefce89c5c8500517f5f065c85b57d98ee (diff) | |
parent | e946217e4fdaa67681bbabfa8e6b18641921f750 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
Diffstat (limited to 'arch/arm/include')
-rw-r--r-- | arch/arm/include/asm/ftrace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h index 584ef9a8e5a..39c8bc1a006 100644 --- a/arch/arm/include/asm/ftrace.h +++ b/arch/arm/include/asm/ftrace.h @@ -1,7 +1,7 @@ #ifndef _ASM_ARM_FTRACE #define _ASM_ARM_FTRACE -#ifdef CONFIG_FTRACE +#ifdef CONFIG_FUNCTION_TRACER #define MCOUNT_ADDR ((long)(mcount)) #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */ |