VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2020-06-01 15:45:27 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2020-06-01 15:45:27 -0700 commit: b23c4771ff62de8ca9b5e4a2d64491b2fb6f8f69 parent: c2b0fc847f3122e5a4176c3772626a7a8facced0

Commit Summary:

Merge tag 'docs-5.8' of git://git.lwn.net/linux

Diffstat:

2 files changed, 6 insertions, 2 deletions

diff --git a/samples/Kconfig b/samples/Kconfig
index 9d236c346de5..205076cf234e 100644
--- a/samples/Kconfig
+++ b/samples/Kconfig
@@ -171,7 +171,7 @@ config SAMPLE_VFIO_MDEV_MBOCHS
 
 config SAMPLE_ANDROID_BINDERFS
 	bool "Build Android binderfs example"
-	depends on CONFIG_ANDROID_BINDERFS
+	depends on ANDROID_BINDERFS
 	help
 	  Builds a sample program to illustrate the use of the Android binderfs
 	  filesystem.
diff --git a/samples/binderfs/Makefile b/samples/binderfs/Makefile
index ea4c93d36256..a3ac5476338a 100644
--- a/samples/binderfs/Makefile
+++ b/samples/binderfs/Makefile
@@ -1,2 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_SAMPLE_ANDROID_BINDERFS) += binderfs_example.o
+ifndef CROSS_COMPILE
+ifdef CONFIG_SAMPLE_ANDROID_BINDERFS
+hostprogs := binderfs_example
+endif
+endif