summaryrefslogtreecommitdiffstats
path: root/arch/mn10300/include/asm/ftrace.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2009-04-22 05:02:09 +0200
committerPaul Mackerras <paulus@samba.org>2009-04-22 05:02:09 +0200
commit5bd3ef84d73c2ea7b4babbad060909753c4828d4 (patch)
treefdf2bafb48ae1ed03175f6c77a7548a181e69ee9 /arch/mn10300/include/asm/ftrace.h
parentpowerpc/85xx: Remove defconfigs that mpc85xx_{smp_}defconfig cover (diff)
parentpowerpc: Fix of_node_put() exit path in of_irq_map_one() (diff)
downloadlinux-5bd3ef84d73c2ea7b4babbad060909753c4828d4.tar.xz
linux-5bd3ef84d73c2ea7b4babbad060909753c4828d4.zip
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
Diffstat (limited to 'arch/mn10300/include/asm/ftrace.h')
-rw-r--r--arch/mn10300/include/asm/ftrace.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mn10300/include/asm/ftrace.h b/arch/mn10300/include/asm/ftrace.h
new file mode 100644
index 000000000000..40a8c178f10d
--- /dev/null
+++ b/arch/mn10300/include/asm/ftrace.h
@@ -0,0 +1 @@
+/* empty */