Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes

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: