path: root/init/main.c
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2020-10-15 15:11:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-10-15 15:11:56 -0700
commitbbf625990371782370f6eacb3155dc1fe131ddfc (patch)
treebcfedc2336284948c1aedc572fcd7ff80bb4262c /init/main.c
parentbf36c6b946c8895cf590f10dbd70b589b0dc101f (diff)
parent2a9b29b289833e42e13fdfb7e082499c1464f25c (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial updates from Jiri Kosina: "The latest advances in computer science from the trivial queue" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: xtensa: fix Kconfig typo spelling.txt: Remove some duplicate entries mtd: rawnand: oxnas: cleanup/simplify code selftests: vm: add fragment CONFIG_GUP_BENCHMARK perf: Fix opt help text for --no-bpf-event HID: logitech-dj: Fix spelling in comment bootconfig: Fix kernel message mentioning CONFIG_BOOT_CONFIG MAINTAINERS: rectify MMP SUPPORT after moving cputype.h scif: Fix spelling of EACCES printk: fix global comment lib/bitmap.c: fix spello fs: Fix missing 'bit' in comment
Diffstat (limited to 'init/main.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c
index e880b4ecb314..1af84337cb18 100644
--- a/init/main.c
+++ b/init/main.c
@@ -468,7 +468,7 @@ static void __init setup_boot_config(const char *cmdline)
static int __init warn_bootconfig(char *str)
- pr_warn("WARNING: 'bootconfig' found on the kernel command line but CONFIG_BOOTCONFIG is not set.\n");
+ pr_warn("WARNING: 'bootconfig' found on the kernel command line but CONFIG_BOOT_CONFIG is not set.\n");
return 0;
early_param("bootconfig", warn_bootconfig);