git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge Btrfs into fs/btrfs
[pandora-kernel.git]
/
include
/
asm-x86
/
ftrace.h
diff --git
a/include/asm-x86/ftrace.h
b/include/asm-x86/ftrace.h
index
c184441
..
5c68b32
100644
(file)
--- a/
include/asm-x86/ftrace.h
+++ b/
include/asm-x86/ftrace.h
@@
-1,5
+1,5
@@
#ifndef _ASM_X86_FTRACE
-#define _ASM_
SPARC64
_FTRACE
+#define _ASM_
X86
_FTRACE
#ifdef CONFIG_FTRACE
#define MCOUNT_ADDR ((long)(mcount))