Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 220669
b: refs/heads/master
c: ba6ff60
h: refs/heads/master
i:
  220667: bf703ab
v: v3
  • Loading branch information
Arnaud Lacombe committed Sep 20, 2010
1 parent 41542a4 commit 100e4b4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0954828fcbf3bd13d593499b16b901a4e801b0b9
refs/heads/master: ba6ff60d5eb47d52f1a5eb0bb6ffa751be838c46
2 changes: 1 addition & 1 deletion trunk/scripts/kconfig/menu.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e
while (isspace(*prompt))
prompt++;
}
if (current_entry->prompt)
if (current_entry->prompt && current_entry != &rootmenu)
prop_warn(prop, "prompt redefined");
current_entry->prompt = prop;
}
Expand Down

0 comments on commit 100e4b4

Please sign in to comment.