From patchwork Wed Apr 2 14:40:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Boyer X-Patchwork-Id: 3929121 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 BE512BF540 for ; Wed, 2 Apr 2014 14:46:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 00A0D20200 for ; Wed, 2 Apr 2014 14:46:46 +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 ED0C0201FB for ; Wed, 2 Apr 2014 14:46:44 +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 1WVMQp-00034E-As; Wed, 02 Apr 2014 14:46:23 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WVMQn-000681-25; Wed, 02 Apr 2014 14:46:21 +0000 Received: from mail-ie0-x233.google.com ([2607:f8b0:4001:c03::233]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WVMQj-00066z-Qm for linux-arm-kernel@lists.infradead.org; Wed, 02 Apr 2014 14:46:18 +0000 Received: by mail-ie0-f179.google.com with SMTP id lx4so307626iec.38 for ; Wed, 02 Apr 2014 07:45:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=plUGJDNtXn5XHvXxX3FaHv/ICYY0iEF4133sqtBBwnw=; b=kPl9Ti1CPt8l3TwUbCqqxyp2H/auvkAs14uI6P6HCxxZnEH9jOJpaAWycNhDjwjeyq QiRROVVFHQbjZG36b00VX/DtT1sELTh//OSTJ5zhhSN1KcUXjNKF9/7L3Xo6MzOOGmZ7 McZOpSnnnLMm6DHMesOE87pUtk+8OVyDbqEboPHLyjlQj99SId6isohNr2u5PIyydnU+ mlvLUR1GTLGSV/aGOKe08zIOp847pGeL2NEgyaPBBBnmwNlHHw6PCvqIWqH8qWVphSbB 1Q1Tv3X+UvKzGaKRY1T+G7Eggv4xNYCL6kE5d3caeQ4YUuQMfXb8b61Jv7KIWTBLCJXl KcIg== X-Received: by 10.43.74.198 with SMTP id yx6mr943410icb.40.1396449637678; Wed, 02 Apr 2014 07:40:37 -0700 (PDT) Received: from zod (75-128-125-27.dhcp.aldl.mi.charter.com. [75.128.125.27]) by mx.google.com with ESMTPSA id r4sm39642481igh.1.2014.04.02.07.40.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Apr 2014 07:40:37 -0700 (PDT) Date: Wed, 2 Apr 2014 10:40:20 -0400 From: Josh Boyer To: Mark Brown , Catalin Marinas Subject: [PATCH] arm64: Fix duplicated Kconfig entries again Message-ID: <20140402144020.GA20438@zod> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140402_104617_923686_3E02C94F X-CRM114-Status: GOOD ( 11.38 ) X-Spam-Score: -1.9 (-) Cc: Lists linaro-kernel , Viresh Kumar , "Rafael J. Wysocki" , "Linux-Kernel@Vger. Kernel. Org" , "cpufreq@vger.kernel.org" , Linus Torvalds , "linux-arm-kernel@lists.infradead.org" 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 Commit 74397174989e5f70 attempted to clean up the power management options for arm64, but when things were merged it didn't fully take effect. Fix it again. Signed-off-by: Josh Boyer Reviewed-by: Viresh Kumar --- arch/arm64/Kconfig | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 07aa3556952c..8033b9b8a2df 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -321,12 +321,6 @@ 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"