Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932711AbaDCEX6 (ORCPT ); Thu, 3 Apr 2014 00:23:58 -0400 Received: from mail-ve0-f169.google.com ([209.85.128.169]:60092 "EHLO mail-ve0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751175AbaDCEX4 (ORCPT ); Thu, 3 Apr 2014 00:23:56 -0400 MIME-Version: 1.0 In-Reply-To: <20140402144020.GA20438@zod> References: <20140402144020.GA20438@zod> Date: Thu, 3 Apr 2014 09:53:56 +0530 X-Google-Sender-Auth: rcD1yDTxTftPA0PnLxLypxP3feg Message-ID: Subject: Re: [PATCH] arm64: Fix duplicated Kconfig entries again From: Viresh Kumar To: Josh Boyer Cc: Mark Brown , Catalin Marinas , Linus Torvalds , "Rafael J. Wysocki" , "cpufreq@vger.kernel.org" , "Linux-Kernel@Vger. Kernel. Org" , "linux-arm-kernel@lists.infradead.org" , Lists linaro-kernel Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 2, 2014 at 8:10 PM, Josh Boyer wrote: > 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 > --- > 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" Reviewed-by: Viresh Kumar -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/