summaryrefslogtreecommitdiff
path: root/include/asm-m32r/ftrace.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-05-05 13:12:55 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-05-05 13:12:55 +0400
commitf3831a592fe4332a70baad64a860b345398885b7 (patch)
treefd27b986295fe5a4f1c0924a804228f829a4c894 /include/asm-m32r/ftrace.h
parent376f7839b72ec526173cafb5d8eadfc61e2effdf (diff)
parent8560b9321f9050968f393ce1ec67e47c1a0bd5cf (diff)
downloadlinux-f3831a592fe4332a70baad64a860b345398885b7.tar.xz
Merge commit 'takashi/topic/asoc' into for-2.6.31
Diffstat (limited to 'include/asm-m32r/ftrace.h')
-rw-r--r--include/asm-m32r/ftrace.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-m32r/ftrace.h b/include/asm-m32r/ftrace.h
deleted file mode 100644
index 40a8c178f10d..000000000000
--- a/include/asm-m32r/ftrace.h
+++ /dev/null
@@ -1 +0,0 @@
-/* empty */