diff options
| author |   Michal Marek <mmarek@suse.cz> | 2010-08-20 13:53:08 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-20 13:53:08 +0200 |
| commit | e981b060767b3c4ac9393ad8d2558d648e35dfcb (patch) | |
| tree | 9c05eaec3072be3645dda61d35085d152b9d5954 /scripts/kconfig | |
| parent | fixes for using make 3.82 (diff) | |
| parent | Linux 2.6.36-rc1 (diff) | |
| download | linux-dev-e981b060767b3c4ac9393ad8d2558d648e35dfcb.tar.xz linux-dev-e981b060767b3c4ac9393ad8d2558d648e35dfcb.zip | |
Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes
Diffstat (limited to 'scripts/kconfig')
| -rw-r--r-- | scripts/kconfig/.gitignore | 1 | ||||
| -rw-r--r-- | scripts/kconfig/conf.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/kconfig/.gitignore b/scripts/kconfig/.gitignore index 6a36a76e6606..624f6502e03e 100644 --- a/scripts/kconfig/.gitignore +++ b/scripts/kconfig/.gitignore @@ -17,6 +17,7 @@ gconf.glade.h # conf mconf +nconf qconf gconf kxgettext diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 4f0ed5b3a75e..5b7c86ea43a1 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -599,12 +599,12 @@ int main(int ac, char **av) break; case savedefconfig: break; - case oldconfig: case oldaskconfig: rootEntry = &rootmenu; conf(&rootmenu); input_mode = silentoldconfig; /* fall through */ + case oldconfig: case listnewconfig: case oldnoconfig: case silentoldconfig: |