VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2020-10-15 18:42:13 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2020-10-15 18:42:13 -0700 commit: 9ff9b0d392ea08090cd1780fb196f36dbb586529 parent: 840e5bb326bbcb16ce82dd2416d2769de4839aea

Commit Summary:

Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

Diffstat:

1 file changed, 3 insertions, 1 deletion

diff --git a/Makefile b/Makefile
index 342d26432553..ebbd34801476 100644
--- a/Makefile
+++ b/Makefile
@@ -1071,13 +1071,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