aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-24 12:44:37 +0100
committerMark Brown <broonie@linaro.org>2014-06-24 12:44:37 +0100
commit3fedfa46c50f8620251c8feca050d6fbff8380ec (patch)
tree635c1cc0a87be1c533a64db864da071ee71d2b38
parentcdb2f0ff6ccb45ed2040f74533bd3fbb386d01b9 (diff)
parent99f555fa816f7436a36ebb0d5327dbfab27c6824 (diff)
downloadlinux-linaro-stable-3fedfa46c50f8620251c8feca050d6fbff8380ec.tar.gz
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-ftrace' into linux-linaro-lsk
-rw-r--r--arch/arm/include/asm/ftrace.h2
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__ */