From: Mark Brown <broonie@linaro.org>
Date: Tue, 11 Mar 2014 13:17:31 +0000 (+0000)
Subject: arm64: Fix duplicated Kconfig entries
X-Git-Tag: v3.15-rc1~164^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74397174989e5f704bcefde7af02e12cc32cb164;p=pandora-kernel.git

arm64: Fix duplicated Kconfig entries

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 <broonie@linaro.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---

Reading git-diff-tree failed