arm64: Fix duplicated Kconfig entries

Commit Message

Mark Brown March 11, 2014, 1:17 p.m. UTC

From: Mark Brown <[e-mail]>

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 <[e-mail]>
---
 arch/arm64/Kconfig | 6 ------
 1 file changed, 6 deletions(-)

Comments

Sudeep Holla March 11, 2014, 1:59 p.m. UTC | #1

Hi Mark,

On 11/03/14 13:17, Mark Brown wrote:
> From: Mark Brown <[e-mail]>
>
> 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.
>

This looks fine to me, but since commit addea9ef055b is only in Rafael's
next tree, Catalin can't take this, so it makes sense to go through Rafael's
tree, right ?

Regards,
Sudeep

> Signed-off-by: Mark Brown <[e-mail]>
> ---
>   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
>

Catalin Marinas March 12, 2014, 5:19 p.m. UTC | #2

On Tue, Mar 11, 2014 at 01:59:34PM +0000, Sudeep Holla wrote:
> On 11/03/14 13:17, Mark Brown wrote:
> > From: Mark Brown <[e-mail]>
> >
> > 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.
> 
> This looks fine to me, but since commit addea9ef055b is only in Rafael's
> next tree, Catalin can't take this, so it makes sense to go through Rafael's
> tree, right ?

I actually took this patch and noticed that Rafael took it as well. The
above commit I think is only valid in the arm64 tree for -next.

Patch

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