summaryrefslogtreecommitdiff
path: root/arch/mips
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-02 23:14:02 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-02 23:14:02 +0100
commit654952bcb999ad96e1d9ae9145fe5c0522ec297a (patch)
tree1c313f5444397a86bdb4d6600ee503d6f75dc9f1 /arch/mips
parented662d9b2a6cb26e1399f57b88b565c0a68c60d4 (diff)
parentc79a61f55773d2519fd0525bf58385f7d20752d3 (diff)
downloadlinux-654952bcb999ad96e1d9ae9145fe5c0522ec297a.tar.gz
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/include/asm/ftrace.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/include/asm/ftrace.h b/arch/mips/include/asm/ftrace.h
new file mode 100644
index 000000000000..40a8c178f10d
--- /dev/null
+++ b/arch/mips/include/asm/ftrace.h
@@ -0,0 +1 @@
+/* empty */