summaryrefslogtreecommitdiff
path: root/arch/nds32/boot/dts/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-12-10 12:11:00 +0300
committerIngo Molnar <mingo@kernel.org>2019-12-10 12:11:00 +0300
commit2040cf9f59037aa8aec749363e69ead165b67b43 (patch)
treee9c15448e841cc493bc80b9f658d7955623e86dd /arch/nds32/boot/dts/Makefile
parentf66c0447cca1281116224d474cdb37d6a18e4b5b (diff)
parente42617b825f8073569da76dc4510bfa019b1c35a (diff)
downloadlinux-2040cf9f59037aa8aec749363e69ead165b67b43.tar.xz
Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/nds32/boot/dts/Makefile')
-rw-r--r--arch/nds32/boot/dts/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/nds32/boot/dts/Makefile b/arch/nds32/boot/dts/Makefile
index fff8ade7a84f..f84bd529b6fd 100644
--- a/arch/nds32/boot/dts/Makefile
+++ b/arch/nds32/boot/dts/Makefile
@@ -5,5 +5,3 @@ else
BUILTIN_DTB :=
endif
obj-$(CONFIG_OF) += $(BUILTIN_DTB)
-
-clean-files := *.dtb *.dtb.S