carl9170: config: fix patching errors and update CMakeFiles

[carl9170fw.git] / config / zconf.y

diff --git a/config/zconf.y b/config/zconf.y
index aedcbc2b0d419ea30bb8d1c17e94310a45f6876f..a990f46f38257702c30311adbca516514c178567 100644 (file)
--- a/config/zconf.y
+++ b/config/zconf.y
@@ -1,8 +1,8 @@
-%{
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
- * Released under the terms of the GNU GPL v2.0.
  */
+%{
 
 #include <ctype.h>
 #include <stdarg.h>
@@ -497,7 +497,6 @@ void conf_parse(const char *name)
        zconf_initscan(name);
 
        _menu_init();
-       rootmenu.prompt = menu_add_prompt(P_MENU, "CARL9170 Firmware Configuration", NULL);
 
        if (getenv("ZCONF_DEBUG"))
                yydebug = 1;
@@ -732,8 +731,4 @@ void zconfdump(FILE *out)
 
 #include "zconf.lex.c"
 #include "util.c"
-#include "confdata.c"
-#include "expr.c"
-#include "symbol.c"
 #include "menu.c"
-#include "preprocess.c"