2 files changed, 10 insertions, 0 deletions

diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped
index a065d5a57c01..bed0f4e2d2f7 100644
--- a/scripts/kconfig/lex.zconf.c_shipped
+++ b/scripts/kconfig/lex.zconf.c_shipped
@@ -1275,6 +1275,11 @@ YY_RULE_SETUP
 case 32:
 YY_RULE_SETUP
 {
+                while (zconfleng) {
+                        if ((zconftext[zconfleng-1] != ' ') && (zconftext[zconfleng-1] != '\t'))
+                                break;
+                        zconfleng--;
+                }
                 append_string(zconftext, zconfleng);
                 if (!first_ts)
                         first_ts = last_ts;
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index 187d38ccadd5..4cea5c85cd0a 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -217,6 +217,11 @@ n	[A-Za-z0-9_]
                 append_string("\n", 1);
         }
         [^ \t\n].* {
+                while (yyleng) {
+                        if ((yytext[yyleng-1] != ' ') && (yytext[yyleng-1] != '\t'))
+                                break;
+                        yyleng--;
+                }
                 append_string(yytext, yyleng);
                 if (!first_ts)
                         first_ts = last_ts;