summaryrefslogtreecommitdiff
path: root/kconfig/lkc_proto.h
diff options
context:
space:
mode:
authorChris Packham <judge.packham@gmail.com>2020-12-10 06:46:43 (GMT)
committerChris Packham <judge.packham@gmail.com>2021-02-02 07:06:32 (GMT)
commit31695dd2b00fc3daac109324992901fdcd6068e5 (patch)
tree4084c739c47255711345e716d70ebe1732c80ad2 /kconfig/lkc_proto.h
parent141f88a5f640625f63f70dad6f216a81596c42fc (diff)
kconfig: Sync with upstream v5.3
This commit introduces the following upstream changes: 0c5b6c28ed68 kconfig: Clear "written" flag to avoid data loss 8e2442a5f86e kconfig: fix missing choice values in auto.conf 3266c806dc86 kconfig: run olddefconfig instead of oldconfig after merging fragments e3cd5136a4ec kconfig: remove meaningless if-conditional in conf_read() baa23ec86092 kconfig: Fix spelling of sym_is_changable cd238effefa2 docs: kbuild: convert docs to ReST and rename to *.rst bd305f259cd3 kconfig: make arch/*/configs/defconfig the default of KBUILD_DEFCONFIG 5533397d1ec8 kconfig: add static qualifier to expand_string() b6f7e9f7050b kconfig: require the argument of --defconfig e0a2668665a5 kconfig: remove always false ifeq ($(KBUILD_DEFCONFIG,) conditional Signed-off-by: Chris Packham <judge.packham@gmail.com>
Diffstat (limited to 'kconfig/lkc_proto.h')
-rw-r--r--kconfig/lkc_proto.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/kconfig/lkc_proto.h b/kconfig/lkc_proto.h
index 86c2675..f9ab982 100644
--- a/kconfig/lkc_proto.h
+++ b/kconfig/lkc_proto.h
@@ -42,7 +42,7 @@ tristate sym_toggle_tristate_value(struct symbol *sym);
bool sym_string_valid(struct symbol *sym, const char *newval);
bool sym_string_within_range(struct symbol *sym, const char *str);
bool sym_set_string_value(struct symbol *sym, const char *newval);
-bool sym_is_changable(struct symbol *sym);
+bool sym_is_changeable(struct symbol *sym);
struct property * sym_get_choice_prop(struct symbol *sym);
const char * sym_get_string_value(struct symbol *sym);
@@ -58,7 +58,6 @@ void env_write_dep(FILE *f, const char *auto_conf_name);
void variable_add(const char *name, const char *value,
enum variable_flavor flavor);
void variable_all_del(void);
-char *expand_string(const char *in);
char *expand_dollar(const char **str);
char *expand_one_token(const char **str);