git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge drm-upstream/drm-next into drm-misc-next
[sfrench/cifs-2.6.git]
/
scripts
/
kconfig
/
zconf.y
diff --git
a/scripts/kconfig/zconf.y
b/scripts/kconfig/zconf.y
index 6f9b0aa32a82239b2bc1540d1b75949859ea48e9..4b68272ebdb96cb25e8d91de0d4cbc792a3079b6 100644
(file)
--- a/
scripts/kconfig/zconf.y
+++ b/
scripts/kconfig/zconf.y
@@
-31,7
+31,7
@@
struct symbol *symbol_hash[SYMBOL_HASHSIZE];
static struct menu *current_menu, *current_entry;
%}
static struct menu *current_menu, *current_entry;
%}
-%expect 3
2
+%expect 3
1
%union
{
%union
{
@@
-337,7
+337,7
@@
choice_block:
/* if entry */
/* if entry */
-if_entry: T_IF expr
nl
+if_entry: T_IF expr
T_EOL
{
printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
menu_add_entry(NULL);
{
printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
menu_add_entry(NULL);
@@
-717,6
+717,10
@@
static void print_symbol(FILE *out, struct menu *menu)
print_quoted_string(out, prop->text);
fputc('\n', out);
break;
print_quoted_string(out, prop->text);
fputc('\n', out);
break;
+ case P_SYMBOL:
+ fputs( " symbol ", out);
+ fprintf(out, "%s\n", prop->sym->name);
+ break;
default:
fprintf(out, " unknown prop %d!\n", prop->type);
break;
default:
fprintf(out, " unknown prop %d!\n", prop->type);
break;