Merge tag 'devicetree-fixes-for-5.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

bb36d37e · Linus Torvalds <[email protected]> · 2020-03-27 11:02:52 -07:00

Pull Devicetree fix from Rob Herring:
 "A single fix for building dtc with GCC 10"

* tag 'devicetree-fixes-for-5.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  scripts/dtc: Remove redundant YYLOC global declaration

Commit: bb36d37e29d4e355fdffb4cd932cbb60e25e7e02
Parents: 1fa8cb0b · e33a814e

Merge commit. Changes below are compared with the first parent: 1fa8cb0b.

Changes

1 files changed · +0 −1

File	Status	Add	Del	Content
scripts/dtc/dtc-lexer.l	modified	+0	−1	View file

scripts/dtc/dtc-lexer.l

View file

diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
index 5c6c3fd..b3b7270 100644
--- a/scripts/dtc/dtc-lexer.l
+++ b/scripts/dtc/dtc-lexer.l
@@ -23,7 +23,6 @@ LINECOMMENT	"//".*\n
 #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() */