From b260c4f610c004c6e9e36c5f7bbb58d23e605bf1 Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Mon, 20 Nov 2017 17:12:18 +0000 Subject: Fix ambiguous grammar for devicetree rule Commit 737b2df3, "overlay: Add syntactic sugar version of overlays" introduced an empty rule for "devicetree" that created ambiguities in the grammar and causes the following warning: BISON dtc-parser.tab.c dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr] Fix the grammar by explicitly testing for the condition the new overlay grammar wants to use. This means duplicating a very small amount of grammar processing code, but the alternative seems to be a more invasive reorganization of the devicetree rule. Better to fix it this way now and save the reorg for a separate patch. Signed-off-by: Grant Likely Cc: Pantelis Antoniou Cc: David Gibson Signed-off-by: David Gibson --- dtc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dtc.h') diff --git a/dtc.h b/dtc.h index 758eb7c..3b18a42 100644 --- a/dtc.h +++ b/dtc.h @@ -204,7 +204,7 @@ struct node *build_node_delete(void); struct node *name_node(struct node *node, char *name); struct node *chain_node(struct node *first, struct node *list); struct node *merge_nodes(struct node *old_node, struct node *new_node); -void add_orphan_node(struct node *old_node, struct node *new_node, char *ref); +struct node *add_orphan_node(struct node *old_node, struct node *new_node, char *ref); void add_property(struct node *node, struct property *prop); void delete_property_by_name(struct node *node, char *name); -- cgit v1.2.1