diff options
author | Michal Marek <mmarek@suse.cz> | 2011-06-08 17:40:20 +0200 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2011-06-08 18:03:57 +0200 |
commit | 36fee53510f91d8ac5eb5dcba0e431a21ebdd5cd (patch) | |
tree | 02cf4abcfc033d75f11b00055280e14eeb86e7e0 /scripts/kconfig/conf.c | |
parent | Merge commit 'v3.0-rc1' into kbuild/kconfig (diff) | |
parent | kconfig/gconf: silent missing prototype warnings (diff) | |
download | linux-36fee53510f91d8ac5eb5dcba0e431a21ebdd5cd.tar.xz linux-36fee53510f91d8ac5eb5dcba0e431a21ebdd5cd.zip |
Merge branch 'kconfig-trivial' of git://github.com/lacombar/linux-2.6 into kbuild/kconfig
Diffstat (limited to 'scripts/kconfig/conf.c')
-rw-r--r-- | scripts/kconfig/conf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 006ad817cd5f..08c05bcc82c9 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -14,7 +14,6 @@ #include <sys/stat.h> #include <sys/time.h> -#define LKC_DIRECT_LINK #include "lkc.h" static void conf(struct menu *menu); @@ -106,6 +105,7 @@ static int conf_askvalue(struct symbol *sym, const char *def) return 0; } check_stdin(); + /* fall through */ case oldaskconfig: fflush(stdout); xfgets(line, 128, stdin); @@ -150,6 +150,7 @@ static int conf_string(struct menu *menu) def = NULL; break; } + /* fall through */ default: line[strlen(line)-1] = 0; def = line; @@ -304,6 +305,7 @@ static int conf_choice(struct menu *menu) break; } check_stdin(); + /* fall through */ case oldaskconfig: fflush(stdout); xfgets(line, 128, stdin); @@ -369,6 +371,7 @@ static void conf(struct menu *menu) check_conf(menu); return; } + /* fall through */ case P_COMMENT: prompt = menu_get_prompt(menu); if (prompt) |