kconfig: don't emit warning upon rootmenu's prompt redefinition
authorArnaud Lacombe <lacombar@gmail.com>
Sat, 4 Sep 2010 20:05:15 +0000 (16:05 -0400)
committerArnaud Lacombe <lacombar@gmail.com>
Mon, 20 Sep 2010 02:53:57 +0000 (22:53 -0400)
This silences the warning printed upon prompt redefinition for the rootmenu.
We will encounter this redefinition when a "mainmenu" statement is specified and
override the default prompt.

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Michal Marek <mmarek@suse.cz>
scripts/kconfig/menu.c

index 682045a7aae4083f6a779e1bb17b8314175c2d79..23acbdb2fd50e83785d5f72654d8a6134d88f7b5 100644 (file)
@@ -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;
        }