update queue-4.4/scripts-dtc-remove-redundant-yyloc-global-declaration.patch

diff --git a/queue-4.4/scripts-dtc-remove-redundant-yyloc-global-declaration.patch b/queue-4.4/scripts-dtc-remove-redundant-yyloc-global-declaration.patch
index 55dbb87370ea9d3bc4144c8bc515729e40a37da6..efead98aa57806ca0d3ebda1def0c7f70ec89217 100644 (file)
--- a/queue-4.4/scripts-dtc-remove-redundant-yyloc-global-declaration.patch
+++ b/queue-4.4/scripts-dtc-remove-redundant-yyloc-global-declaration.patch
@@ -34,11 +34,15 @@ Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
 [robh: cherry-pick from upstream]
 Cc: stable@vger.kernel.org
 Signed-off-by: Rob Herring <robh@kernel.org>
+[nc: Also apply to dtc-lexer.lex.c_shipped due to a lack of
+     e039139be8c2, where dtc-lexer.l started being used]
+Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- scripts/dtc/dtc-lexer.l |    1 -
- 1 file changed, 1 deletion(-)
+ scripts/dtc/dtc-lexer.l             |    1 -
+ scripts/dtc/dtc-lexer.lex.c_shipped |    1 -
+ 2 files changed, 2 deletions(-)
 
 --- a/scripts/dtc/dtc-lexer.l
 +++ b/scripts/dtc/dtc-lexer.l
@@ -50,3 +54,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  extern bool treesource_error;
  
  /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+--- a/scripts/dtc/dtc-lexer.lex.c_shipped
++++ b/scripts/dtc/dtc-lexer.lex.c_shipped
+@@ -637,7 +637,6 @@ char *yytext;
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+ 
+-YYLTYPE yylloc;
+ extern bool treesource_error;
+ 
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */