From patchwork Tue Mar 25 09:00:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 3886201 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0CA3FBF540 for ; Tue, 25 Mar 2014 09:03:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 497F5201FD for ; Tue, 25 Mar 2014 09:03:10 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 616BB201F9 for ; Tue, 25 Mar 2014 09:03:09 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WSNG6-0008O5-2w; Tue, 25 Mar 2014 09:02:58 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WSNG3-0004fA-HP; Tue, 25 Mar 2014 09:02:55 +0000 Received: from mail-pd0-f173.google.com ([209.85.192.173]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WSNFz-0004dZ-9I for linux-arm-kernel@lists.infradead.org; Tue, 25 Mar 2014 09:02:51 +0000 Received: by mail-pd0-f173.google.com with SMTP id z10so167734pdj.4 for ; Tue, 25 Mar 2014 02:02:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ZDIJVAUzz83A6/N391WWN4gZ82sMvQvV4/SQr0bAGSg=; b=FOxKRuSNh2XPIC0noJ3vkGHdL9fBHY/DVC5NP+jXbfQxbWygUB+xfK2YwqkHc81b8/ MKNDikll0wGuhkffZecxE17DADuVo4ymj3iiVKU03sbBL5XaJFsJTnvdY9CGFvRtO0tc NIFxXzUH0o9m1O0dDOmk7K2DcOYFHxxSiwshP8C/PSLjJhJj9l+SXZ+8/9ouhS8uTOZj vyVH6ckkh7Ibs0wVxLKYX3vDbSaSo1s7HRUGNl4d2r7OsdclIqurPH9SvR/x6UM8M/FD tCXjn063r1bTCBFYRjigFEOIUfMpukZXKp5OsY9OuwE5nFMiXkigTnnLNbWwaKQGenMi V6NA== X-Gm-Message-State: ALoCoQkNgWDbODDUiMVGjHeZWhppgibK3nnJ0az6T1h5YU8sRiiQgOTOwsd9Ae7Udu2cMWpph3Mn X-Received: by 10.68.113.194 with SMTP id ja2mr77310958pbb.30.1395738146799; Tue, 25 Mar 2014 02:02:26 -0700 (PDT) Received: from localhost ([218.17.215.175]) by mx.google.com with ESMTPSA id tf10sm41729347pbc.70.2014.03.25.02.02.21 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 25 Mar 2014 02:02:26 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , Will Deacon Subject: [PATCH] arm64: Fix duplicated Kconfig entries again Date: Tue, 25 Mar 2014 17:00:59 +0800 Message-Id: <1395738060-18489-1-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140325_050251_389329_9EBBEBDB X-CRM114-Status: UNSURE ( 7.95 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.1 (-) Cc: Hanjun Guo , linaro-acpi@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Brown X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB,RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP After commit 74397174989e5 (arm64: Fix duplicated Kconfig entries), I still get a duplicate Power management options section in linux-next git repo, may be due to some merge conflicts, anyway, fix that in this patch. Signed-off-by: Hanjun Guo --- Based on linux-next repo, weird, did I miss something? --- arch/arm64/Kconfig | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index d9f23ad..6085dca 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -317,24 +317,12 @@ config ARCH_SUSPEND_POSSIBLE config ARM64_CPU_SUSPEND def_bool PM_SLEEP -endmenu - -menu "CPU Power Management" - source "drivers/cpuidle/Kconfig" source "drivers/cpufreq/Kconfig" endmenu -menu "Power management options" - -source "kernel/power/Kconfig" - -source "drivers/cpufreq/Kconfig" - -endmenu - source "net/Kconfig" source "drivers/Kconfig"