diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 07:22:08 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 07:22:08 -0400 |
| commit | fb8231a8b139035476f2a8aaac837d0099b66dad (patch) | |
| tree | 2875806beb96ea0cdab292146767a5085721dc6a /arch/blackfin/kernel/Makefile | |
| parent | 426d31071ac476ea62c62656b242930c17b58c00 (diff) | |
| parent | f6cec0ae58c17522a7bc4e2f39dae19f199ab534 (diff) | |
Merge branch 'master' into for-next
Conflicts:
arch/arm/mach-omap1/board-nokia770.c
Diffstat (limited to 'arch/blackfin/kernel/Makefile')
| -rw-r--r-- | arch/blackfin/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/kernel/Makefile b/arch/blackfin/kernel/Makefile index 30d0d1f01dc7..ca5ccc777772 100644 --- a/arch/blackfin/kernel/Makefile +++ b/arch/blackfin/kernel/Makefile | |||
| @@ -16,6 +16,7 @@ else | |||
| 16 | obj-y += time.o | 16 | obj-y += time.o |
| 17 | endif | 17 | endif |
| 18 | 18 | ||
| 19 | obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o | ||
| 19 | obj-$(CONFIG_FUNCTION_TRACER) += ftrace-entry.o | 20 | obj-$(CONFIG_FUNCTION_TRACER) += ftrace-entry.o |
| 20 | obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o | 21 | obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o |
| 21 | CFLAGS_REMOVE_ftrace.o = -pg | 22 | CFLAGS_REMOVE_ftrace.o = -pg |