VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2020-10-15 15:11:56 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2020-10-15 15:11:56 -0700 commit: bbf625990371782370f6eacb3155dc1fe131ddfc parent: bf36c6b946c8895cf590f10dbd70b589b0dc101f

Commit Summary:

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Diffstat:

1 file changed, 1 insertion, 1 deletion

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);