From patchwork Fri Aug  6 05:13:54 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Sam Ravnborg <sam@ravnborg.org>
X-Patchwork-Id: 117662
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o765DwvM007733
	for <patchwork-kbuild@patchwork.kernel.org>;
	Fri, 6 Aug 2010 05:13:58 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755878Ab0HFFN5 (ORCPT
	<rfc822;patchwork-kbuild@patchwork.kernel.org>);
	Fri, 6 Aug 2010 01:13:57 -0400
Received: from pfepa.post.tele.dk ([195.41.46.235]:37376 "EHLO
	pfepa.post.tele.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751623Ab0HFFN5 (ORCPT
	<rfc822;linux-kbuild@vger.kernel.org>);
	Fri, 6 Aug 2010 01:13:57 -0400
Received: from merkur.ravnborg.org (x1-6-00-1e-2a-84-ae-3e.k225.webspeed.dk
	[80.163.61.94])
	by pfepa.post.tele.dk (Postfix) with ESMTP id 9FE19A50020;
	Fri,  6 Aug 2010 07:13:52 +0200 (CEST)
Date: Fri, 6 Aug 2010 07:13:54 +0200
From: Sam Ravnborg <sam@ravnborg.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: "Justin P. Mattock" <justinmattock@gmail.com>,
	Michal Marek <mmarek@suse.cz>, JBeulich@novell.com, aris@redhat.com,
	catalin.marinas@arm.com, jacmet@sunsite.dk, lizf@cn.fujitsu.com,
	ulfalizer.lkml@gmail.com, zippel@linux-m68k.org,
	linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] kconfig: fix make oldconfig
Message-ID: <20100806051354.GA24343@merkur.ravnborg.org>
References: <20100804125156.GA23464@sepie.suse.cz>
	<AANLkTi=hYsksUJUsrETjFouLDiKhwQHgD2oQ7XLyrOC-@mail.gmail.com>
	<4C5B64EA.2000804@gmail.com>
	<AANLkTikpsvpHuB-mWVfmqTRRMvbvhJz2LmoYBgtn4NQE@mail.gmail.com>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <AANLkTikpsvpHuB-mWVfmqTRRMvbvhJz2LmoYBgtn4NQE@mail.gmail.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
Sender: linux-kbuild-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kbuild.vger.kernel.org>
X-Mailing-List: linux-kbuild@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Fri, 06 Aug 2010 05:13:58 +0000 (UTC)


diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 010600e..274f271 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: