summaryrefslogtreecommitdiffstats
path: root/scripts/kconfig/conf.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-10-19 10:13:00 +0200
committerChris Wilson <chris@chris-wilson.co.uk>2010-10-19 10:14:50 +0200
commitfb9a90f7c674f3ddef6baf55cb1612dadd8ea752 (patch)
treef25cf2ce17449ba34cdfdfb948134eb3464e400e /scripts/kconfig/conf.c
parentdrm/i915: Update hotplug interrupts register definitions for Sandybridge (diff)
parentdrm, kdb, kms: Change mode_set_base_atomic() enter argument to be an enum (diff)
downloadlinux-fb9a90f7c674f3ddef6baf55cb1612dadd8ea752.tar.xz
linux-fb9a90f7c674f3ddef6baf55cb1612dadd8ea752.zip
Merge remote branch 'airlied/drm-core-next' into tmp
Diffstat (limited to 'scripts/kconfig/conf.c')
-rw-r--r--scripts/kconfig/conf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 5b7c86ea43a1..7ef429cd5cb3 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -427,7 +427,7 @@ static void check_conf(struct menu *menu)
if (sym->name && !sym_is_choice_value(sym)) {
printf("CONFIG_%s\n", sym->name);
}
- } else {
+ } else if (input_mode != oldnoconfig) {
if (!conf_cnt++)
printf(_("*\n* Restart config...\n*\n"));
rootEntry = menu_get_parent_menu(menu);