arm: Fix build error "conflicting types for 'scale_cpu_capacity'"
authorSteve Muckle <smuckle@linaro.org>
Thu, 5 May 2016 01:56:45 +0000 (18:56 -0700)
committerAmit Pundir <amit.pundir@linaro.org>
Wed, 14 Sep 2016 09:47:01 +0000 (15:17 +0530)
commitfbc1f826a81fd7cb78f2d9a7508379f493038d88
treefd14e8c34982e2e7e25cff458e57965ce67ca9e4
parent6b84e134d8420374c1640f4615953dc4f8563c0d
arm: Fix build error "conflicting types for 'scale_cpu_capacity'"

Commit "arm: Update arch_scale_cpu_capacity() to reflect change to
define" introduced a dependency on struct sched_domain in
arch/arm/include/asm/topologoy.h, but that structure is only currently
defined if CONFIG_CPU_FREQ is enabled, which causes
include/linux/cpufreq.h to get pulled in which defines it.

Include <linux/cpufreq.h> regardless of CONFIG_CPU_FREQ so struct
sched_domain is always defined.

Fixes: Change-Id: I372bd5e4c1e203428d72b18c8a806b06f3567ef6
       ("arm: Update arch_scale_cpu_capacity() to reflect change to define")
Signed-off-by: Steve Muckle <smuckle@linaro.org>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
[jstultz: Cherry-picked from android-3.18]
Signed-off-by: John Stultz <john.stultz@linaro.org>
arch/arm/include/asm/topology.h