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 commit 'v2.6.36-rc1' into HEAD
[pandora-kernel.git]
/
arch
/
blackfin
/
kernel
/
Makefile
diff --git
a/arch/blackfin/kernel/Makefile
b/arch/blackfin/kernel/Makefile
index
30d0d1f
..
ca5ccc7
100644
(file)
--- a/
arch/blackfin/kernel/Makefile
+++ b/
arch/blackfin/kernel/Makefile
@@
-16,6
+16,7
@@
else
obj-y += time.o
endif
+obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o
obj-$(CONFIG_FUNCTION_TRACER) += ftrace-entry.o
obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o
CFLAGS_REMOVE_ftrace.o = -pg