diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 23:29:16 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 23:29:16 +0300 |
commit | 6adc19fd13f11883c44df67b551cf8201e6bba1d (patch) | |
tree | 455e80aca7b57b17069fab252261c4dcae44374d /samples/Makefile | |
parent | 3df83e164f1f39c614a3f31e39164756945ae2ea (diff) | |
parent | a7f7f6248d9740d710fd6bd190293fe5e16410ac (diff) | |
download | linux-6adc19fd13f11883c44df67b551cf8201e6bba1d.tar.xz |
Merge tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild updates from Masahiro Yamada:
- fix build rules in binderfs sample
- fix build errors when Kbuild recurses to the top Makefile
- covert '---help---' in Kconfig to 'help'
* tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
treewide: replace '---help---' in Kconfig files with 'help'
kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables
samples: binderfs: really compile this sample and fix build issues
Diffstat (limited to 'samples/Makefile')
-rw-r--r-- | samples/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/Makefile b/samples/Makefile index 5b2629778754..754553597581 100644 --- a/samples/Makefile +++ b/samples/Makefile @@ -2,7 +2,7 @@ # Makefile for Linux samples code subdir-$(CONFIG_SAMPLE_AUXDISPLAY) += auxdisplay -obj-$(CONFIG_SAMPLE_ANDROID_BINDERFS) += binderfs/ +subdir-$(CONFIG_SAMPLE_ANDROID_BINDERFS) += binderfs obj-$(CONFIG_SAMPLE_CONFIGFS) += configfs/ obj-$(CONFIG_SAMPLE_CONNECTOR) += connector/ subdir-$(CONFIG_SAMPLE_HIDRAW) += hidraw |