diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-24 12:46:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-24 12:46:29 +0100 |
| commit | ca1c48eb89eb19eae1c6420454b20774f9ce48d7 (patch) | |
| tree | 976eccb930896e8608c1c35ad8a64636a0c91415 /arch | |
| parent | 03559aeb253005a49f6660df54cb97e6d1ff3c2a (diff) | |
| parent | 3fedfa46c50f8620251c8feca050d6fbff8380ec (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'arch')
| -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 eb577f4f5f70..39eb16b0066f 100644 --- a/arch/arm/include/asm/ftrace.h +++ b/arch/arm/include/asm/ftrace.h @@ -52,7 +52,7 @@ extern inline void *return_address(unsigned int level) #endif -#define ftrace_return_addr(n) return_address(n) +#define ftrace_return_address(n) return_address(n) #endif /* ifndef __ASSEMBLY__ */ |