diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 13:29:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-13 13:29:16 -0700 |
| commit | 6adc19fd13f11883c44df67b551cf8201e6bba1d (patch) | |
| tree | 455e80aca7b57b17069fab252261c4dcae44374d /arch/m68k/Kconfig.machine | |
| parent | 3df83e164f1f39c614a3f31e39164756945ae2ea (diff) | |
| parent | a7f7f6248d9740d710fd6bd190293fe5e16410ac (diff) | |
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 'arch/m68k/Kconfig.machine')
| -rw-r--r-- | arch/m68k/Kconfig.machine | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine index b23a66bac77f..a82651d58af4 100644 --- a/arch/m68k/Kconfig.machine +++ b/arch/m68k/Kconfig.machine @@ -437,7 +437,7 @@ config ROMSIZE choice prompt "Kernel executes from" - ---help--- + help Choose the memory type that the kernel will be running in. config RAMKERNEL |