diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-06-02 08:18:06 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-06-02 08:18:06 -0400 |
commit | c7a441bba9de3b4e166b6a4449208bc906d70558 (patch) | |
tree | 346fdf11e464c8201a9aaa8abdd1c1b6dc4f86e0 /scripts/kconfig/lkc_proto.h | |
parent | ead54d878465291746c91c95749990d62742a6cf (diff) | |
parent | e4caa8bab3862a7694ab7c6dfede223227ad7fc5 (diff) |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'scripts/kconfig/lkc_proto.h')
-rw-r--r-- | scripts/kconfig/lkc_proto.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h index ffeb532b2cff..7cadcad8233b 100644 --- a/scripts/kconfig/lkc_proto.h +++ b/scripts/kconfig/lkc_proto.h | |||
@@ -11,13 +11,15 @@ P(conf_set_changed_callback, void,(void (*fn)(void))); | |||
11 | /* menu.c */ | 11 | /* menu.c */ |
12 | P(rootmenu,struct menu,); | 12 | P(rootmenu,struct menu,); |
13 | 13 | ||
14 | P(menu_is_visible,bool,(struct menu *menu)); | 14 | P(menu_is_visible, bool, (struct menu *menu)); |
15 | P(menu_has_prompt, bool, (struct menu *menu)); | ||
15 | P(menu_get_prompt,const char *,(struct menu *menu)); | 16 | P(menu_get_prompt,const char *,(struct menu *menu)); |
16 | P(menu_get_root_menu,struct menu *,(struct menu *menu)); | 17 | P(menu_get_root_menu,struct menu *,(struct menu *menu)); |
17 | P(menu_get_parent_menu,struct menu *,(struct menu *menu)); | 18 | P(menu_get_parent_menu,struct menu *,(struct menu *menu)); |
18 | P(menu_has_help,bool,(struct menu *menu)); | 19 | P(menu_has_help,bool,(struct menu *menu)); |
19 | P(menu_get_help,const char *,(struct menu *menu)); | 20 | P(menu_get_help,const char *,(struct menu *menu)); |
20 | P(get_symbol_str,void,(struct gstr *r, struct symbol *sym)); | 21 | P(get_symbol_str, void, (struct gstr *r, struct symbol *sym)); |
22 | P(get_relations_str, struct gstr, (struct symbol **sym_arr)); | ||
21 | P(menu_get_ext_help,void,(struct menu *menu, struct gstr *help)); | 23 | P(menu_get_ext_help,void,(struct menu *menu, struct gstr *help)); |
22 | 24 | ||
23 | /* symbol.c */ | 25 | /* symbol.c */ |