From 100e4b4504f62907954b5010338bdb7cc4588f61 Mon Sep 17 00:00:00 2001
From: Arnaud Lacombe <lacombar@gmail.com>
Date: Sat, 4 Sep 2010 16:05:15 -0400
Subject: [PATCH] --- yaml --- r: 220669 b: refs/heads/master c:
 ba6ff60d5eb47d52f1a5eb0bb6ffa751be838c46 h: refs/heads/master i:   220667:
 bf703abba203b36681e98d891e62fc277b556bba v: v3

---
 [refs]                       | 2 +-
 trunk/scripts/kconfig/menu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d43837576d3e..88c1c706ff8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0954828fcbf3bd13d593499b16b901a4e801b0b9
+refs/heads/master: ba6ff60d5eb47d52f1a5eb0bb6ffa751be838c46
diff --git a/trunk/scripts/kconfig/menu.c b/trunk/scripts/kconfig/menu.c
index 682045a7aae4..23acbdb2fd50 100644
--- a/trunk/scripts/kconfig/menu.c
+++ b/trunk/scripts/kconfig/menu.c
@@ -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;
 	}