From 5d7000ba8ae589902aaa330300042c6424c6a118 Mon Sep 17 00:00:00 2001
From: "Brian S. Dean" <bsd@bsdhome.com>
Date: Wed, 5 Mar 2003 01:19:17 +0000
Subject: [PATCH] Do that last commit slightly differently - this way results
 in no shift-reduce conflicts.

git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk@256 81a1dc3b-b13d-400b-aceb-764788c761c2
---
 avrdude/config_gram.y | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/avrdude/config_gram.y b/avrdude/config_gram.y
index f3407f66..70bc8fca 100644
--- a/avrdude/config_gram.y
+++ b/avrdude/config_gram.y
@@ -116,10 +116,13 @@ static int parse_cmdbits(OPCODE * op);
 %token TKN_STRING
 %token TKN_ID
 
-%start config
+%start configuration
 
 %%
 
+configuration :
+  /* empty */ | config
+;
 
 config :
   def |
@@ -148,9 +151,7 @@ def :
     strncpy(default_serial, $3->value.string, PATH_MAX);
     default_serial[PATH_MAX-1] = 0;
     free_token($3);
-  } |
-
-  /* empty */
+  }
 ;