diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-16 22:44:14 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-16 22:44:14 +0200 |
| commit | 1652a83fa494b12e20fc02a2cc3ddbcd75d53170 (patch) | |
| tree | 2aa6461f309916dfadb19ed9e30886f4ece11e39 /arch/nds32/kernel/Makefile | |
| parent | d6142b91e9cc249b3aa22c90fade67e2e2d52cdb (diff) | |
| parent | 7876320f88802b22d4e2daf7eb027dd14175a0f8 (diff) | |
Merge 4.19-rc4 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/nds32/kernel/Makefile')
| -rw-r--r-- | arch/nds32/kernel/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/nds32/kernel/Makefile b/arch/nds32/kernel/Makefile index 42792743e8b9..27cded39fa66 100644 --- a/arch/nds32/kernel/Makefile +++ b/arch/nds32/kernel/Makefile @@ -21,3 +21,9 @@ extra-y := head.o vmlinux.lds obj-y += vdso/ + +obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o + +ifdef CONFIG_FUNCTION_TRACER +CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE) +endif |