VisionFive2 Linux kernel

author: David S. Miller <davem@davemloft.net> 2020-09-23 13:11:11 -0700 committer: David S. Miller <davem@davemloft.net> 2020-09-23 13:11:11 -0700 commit: 6d772f328d6ad3e4fb64385784571be4be25e63d parent: 1a26e88d534b816c126891a4b81ad93b284d28a1

Commit Summary:

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

Diffstat:

1 file changed, 3 insertions, 1 deletion

diff --git a/Makefile b/Makefile
index 2b66d3398878..d387c5a239b7 100644
--- a/Makefile
+++ b/Makefile
@@ -1080,13 +1080,15 @@ ifdef CONFIG_STACK_VALIDATION
   endif
 endif
 
+ifdef CONFIG_BPF
 ifdef CONFIG_DEBUG_INFO_BTF
   ifeq ($(has_libelf),1)
     resolve_btfids_target := tools/bpf/resolve_btfids FORCE
   else
     ERROR_RESOLVE_BTFIDS := 1
   endif
-endif
+endif # CONFIG_DEBUG_INFO_BTF
+endif # CONFIG_BPF
 
 PHONY += prepare0