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: 27017 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 04EAE20062 for ; Tue, 25 Mar 2014 09:02:45 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id j7sf340357qaq.10 for ; Tue, 25 Mar 2014 02:02:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=CP1M8wRUHZXh6ZLBZRHy4tZgpL7MBMgpn2P0tgSOw8s=; b=W0HtcqcAE9fuuwl1PGq5lmEMgTLFw6l/1K2LI3Qia4NyKaGw1dK6h8KMYDDBER+4MY k6czlUYDyWK5AiLZU7It6UQqCrwYMcldOhDpsLnuH0QqeOg0AwBEHiZfUp8R0TEE6Dwy iP6UPMUSl7xB+GcnZPOGQOopxrG6DHbgVvxsTeQT2J1ng4uisgGc0ZBU2buxnIy42bqr tSwjW+rvMsoMb9uFFcjs/7zfWuIOCouHGMtmt9NjJe51gItOSvkK1h4o+zLN+ls7ZZU6 iE5LN2UrxTE5tPBBstDc2zg3oiE3aqhjR2t7rK+j9YwtRfWmGnc+pBeyn6lnDlh20TOT StnQ== X-Gm-Message-State: ALoCoQl1+HyyyH5JlDxKW4x9EtwEOSLkOAmPo4/ZxPmdhgFVNM8qZCgxBw5RVH6zA/5REwHlMGNE X-Received: by 10.236.113.43 with SMTP id z31mr12035538yhg.33.1395738165731; Tue, 25 Mar 2014 02:02:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.20.138 with SMTP id 10ls137985qgj.92.gmail; Tue, 25 Mar 2014 02:02:45 -0700 (PDT) X-Received: by 10.52.69.146 with SMTP id e18mr46257612vdu.15.1395738165636; Tue, 25 Mar 2014 02:02:45 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id bf4si3600697vec.100.2014.03.25.02.02.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Mar 2014 02:02:45 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id oz11so173838veb.6 for ; Tue, 25 Mar 2014 02:02:45 -0700 (PDT) X-Received: by 10.221.28.202 with SMTP id rv10mr1174833vcb.10.1395738165557; Tue, 25 Mar 2014 02:02:45 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp287491vck; Tue, 25 Mar 2014 02:02:45 -0700 (PDT) X-Received: by 10.66.252.135 with SMTP id zs7mr77922316pac.13.1395738164699; Tue, 25 Mar 2014 02:02:44 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ep2si10951928pbb.246.2014.03.25.02.02.44; Tue, 25 Mar 2014 02:02:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752587AbaCYJCa (ORCPT + 26 others); Tue, 25 Mar 2014 05:02:30 -0400 Received: from mail-pb0-f54.google.com ([209.85.160.54]:63237 "EHLO mail-pb0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751121AbaCYJC1 (ORCPT ); Tue, 25 Mar 2014 05:02:27 -0400 Received: by mail-pb0-f54.google.com with SMTP id ma3so165135pbc.41 for ; Tue, 25 Mar 2014 02:02:27 -0700 (PDT) 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 Cc: Mark Brown , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-acpi@lists.linaro.org, Hanjun Guo 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 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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"