summaryrefslogtreecommitdiff
path: root/kconfig
diff options
context:
space:
mode:
authorChris Packham <judge.packham@gmail.com>2020-12-09 08:55:38 (GMT)
committerChris Packham <judge.packham@gmail.com>2021-02-02 07:06:32 (GMT)
commitb16baed494d3c3fb66eeaaf9d8c1dbc7c6c0479f (patch)
tree2345bf59c728221b885eb712f436136070fb6982 /kconfig
parentdf94f6803fe17fd1030ef08ff0463e437b9323b9 (diff)
kconfig: Sync with upstream v4.20
6bbe4385d035 kconfig: merge_config: avoid false positive matches from comment lines 2cd3faf87d2d merge_config.sh: Allow to define config prefix 0085b4191f3e kconfig: remove silentoldconfig target 04c459d20448 kconfig: remove oldnoconfig target Signed-off-by: Chris Packham <judge.packham@gmail.com>
Diffstat (limited to 'kconfig')
-rw-r--r--kconfig/conf.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/kconfig/conf.c b/kconfig/conf.c
index a0db354..5a795c5 100644
--- a/kconfig/conf.c
+++ b/kconfig/conf.c
@@ -460,12 +460,6 @@ static struct option long_opts[] = {
{"randconfig", no_argument, NULL, randconfig},
{"listnewconfig", no_argument, NULL, listnewconfig},
{"olddefconfig", no_argument, NULL, olddefconfig},
- /*
- * oldnoconfig is an alias of olddefconfig, because people already
- * are dependent on its behavior(sets new symbols to their default
- * value but not 'n') with the counter-intuitive name.
- */
- {"oldnoconfig", no_argument, NULL, olddefconfig},
{NULL, 0, NULL, 0}
};