projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'acpica'
[cascardo/linux.git]
/
arch
/
arm
/
include
/
asm
/
ftrace.h
diff --git
a/arch/arm/include/asm/ftrace.h
b/arch/arm/include/asm/ftrace.h
index
eb577f4
..
39eb16b
100644
(file)
--- 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_addr
ess
(n) return_address(n)
#endif /* ifndef __ASSEMBLY__ */