From patchwork Tue Mar 11 13:17:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 26020 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2B96B202E1 for ; Tue, 11 Mar 2014 13:18:46 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id rl12sf33769775iec.10 for ; Tue, 11 Mar 2014 06:18: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:delivered-to:from:to:date:message-id:subject:cc :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=SBxpK8zETvU+gw58Hk6UuQDn57LoWN/Ij5jbKbuEIhQ=; b=Gt5Ked2ReEXiFIezGP/itN461YFWiMbUCzwma5khEinSAEZd74096iELLAMer+tvJ3 cjTCLIBBM2QpMYa/JU4v9WdQSzUJku/gf0YdxVab/BDs1vMvYkLgKkmrJjOCmEIhWYKL r5L0Lo51u+TGqufHMWaqjdmxO6vqSuSC6aClEnXcLSZ3ri8klyuvCEjqK151zWGLTH/I eUdaL8psC0Yz53J79Z6Zm5uryFyl60cP3CPwp6dD4gIuhbk/HMnrfvrjDrGEbn4o1Y7Y FOELF+GxB1NCpqnSqCEN8vBNMyYkFDVpdVlGY0d+LOiyA665fLKzoDAYQim8C/FaTb/u ETGQ== X-Gm-Message-State: ALoCoQnVvSDym0ECS/Xm0IdN7BZHY9M+DBN3YnlHZwlpBwKOz10eK0Bz/wxK19sF6rSCVqdB48hw X-Received: by 10.182.17.69 with SMTP id m5mr16300702obd.6.1394543925519; Tue, 11 Mar 2014 06:18:45 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.107.228 with SMTP id h91ls2432556qgf.76.gmail; Tue, 11 Mar 2014 06:18:45 -0700 (PDT) X-Received: by 10.52.65.132 with SMTP id x4mr263378vds.36.1394543925364; Tue, 11 Mar 2014 06:18:45 -0700 (PDT) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id h13si5720459vct.68.2014.03.11.06.18.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Mar 2014 06:18:45 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.169 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.169; Received: by mail-ve0-f169.google.com with SMTP id pa12so8543031veb.14 for ; Tue, 11 Mar 2014 06:18:45 -0700 (PDT) X-Received: by 10.52.161.130 with SMTP id xs2mr22160vdb.49.1394543925160; Tue, 11 Mar 2014 06:18: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 i9csp204473vck; Tue, 11 Mar 2014 06:18:44 -0700 (PDT) X-Received: by 10.180.164.229 with SMTP id yt5mr3154762wib.49.1394543924195; Tue, 11 Mar 2014 06:18:44 -0700 (PDT) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id x4si21321197wjf.112.2014.03.11.06.18.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Mar 2014 06:18:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:770:15f::2 as permitted sender) client-ip=2001:770:15f::2; Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WNMZQ-0005xp-LP; Tue, 11 Mar 2014 13:18:12 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WNMZL-0006IO-CN; Tue, 11 Mar 2014 13:18:07 +0000 Received: from mezzanine.sirena.org.uk ([2400:8900::f03c:91ff:fedb:4f4]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WNMZJ-0006HL-2y for linux-arm-kernel@lists.infradead.org; Tue, 11 Mar 2014 13:18:05 +0000 Received: from cpc11-sgyl31-2-0-cust672.sgyl.cable.virginm.net ([94.175.94.161] helo=debutante.sirena.org.uk) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1WNMYp-0006dz-Pl; Tue, 11 Mar 2014 13:17:37 +0000 Received: from broonie by debutante.sirena.org.uk with local (Exim 4.82) (envelope-from ) id 1WNMYm-00033q-CF; Tue, 11 Mar 2014 13:17:32 +0000 From: Mark Brown To: Catalin Marinas , Will Deacon , Sudeep Holla Date: Tue, 11 Mar 2014 13:17:31 +0000 Message-Id: <1394543851-11732-1-git-send-email-broonie@kernel.org> X-Mailer: git-send-email 1.9.0 X-SA-Exim-Connect-IP: 94.175.94.161 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mezzanine.sirena.org.uk X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.2 Subject: [PATCH] arm64: Fix duplicated Kconfig entries X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140311_091805_508041_84AABD0F X-CRM114-Status: UNSURE ( 9.15 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linaro-kernel@lists.linaro.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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: broonie@kernel.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.169 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 From: Mark Brown Probably due to rebasing over the lengthy time it took to get the patch merged commit addea9ef055b (cpufreq: enable ARM drivers on arm64) added a duplicate Power management options section. Add CPUfreq to the CPU power management section and remove a duplicate include of the main power section. Signed-off-by: Mark Brown --- arch/arm64/Kconfig | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index a3c40d65128b..2474c24dc229 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -318,12 +318,6 @@ menu "CPU Power Management" source "drivers/cpuidle/Kconfig" -endmenu - -menu "Power management options" - -source "kernel/power/Kconfig" - source "drivers/cpufreq/Kconfig" endmenu