summaryrefslogtreecommitdiff
path: root/arch/m32r/include/asm/ftrace.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-17 09:57:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-17 09:57:17 -0700
commit4dc8ab86e0724642e2f778116de64f4b832d7d94 (patch)
treeba3e1327823ac94dc5d33cb76d8704ea0ad915d7 /arch/m32r/include/asm/ftrace.h
parentb9836e08375d86834edcde45e3628e63db8b9624 (diff)
parent78a49990269a539fc77e9a669d9e74e1dfaec657 (diff)
downloadlwn-4dc8ab86e0724642e2f778116de64f4b832d7d94.tar.gz
lwn-4dc8ab86e0724642e2f778116de64f4b832d7d94.zip
Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev: m32r: move include/asm-m32r/* to arch/m32r/include/asm/ m32r: move include/asm-m32r headers to arch/m32r/include/asm
Diffstat (limited to 'arch/m32r/include/asm/ftrace.h')
-rw-r--r--arch/m32r/include/asm/ftrace.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m32r/include/asm/ftrace.h b/arch/m32r/include/asm/ftrace.h
new file mode 100644
index 000000000000..40a8c178f10d
--- /dev/null
+++ b/arch/m32r/include/asm/ftrace.h
@@ -0,0 +1 @@
+/* empty */