diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-05-03 14:24:47 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-05-03 14:24:47 +0100 |
| commit | 83e4a8b0fe64a97fc92f436c7eff09569352c5ed (patch) | |
| tree | f246aa7e2078ad15dfb2458f9e2a578be902740c /arch/arm | |
| parent | fe36ba6207e538cb5d088a512dfbcba1d14f3987 (diff) | |
| parent | be19b71b407ca8fbf196814a65bfa1a99bda3370 (diff) | |
Merge branch 'tracking-armlt-tc2-cpufreq' into integration-linux-vexpress
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kernel/topology.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-vexpress/Kconfig | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index fa45fb43a62..8df74d630ca 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c @@ -13,6 +13,7 @@ #include <linux/cpu.h> #include <linux/cpumask.h> +#include <linux/export.h> #include <linux/init.h> #include <linux/percpu.h> #include <linux/node.h> @@ -201,6 +202,7 @@ static inline void update_cpu_power(unsigned int cpuid, unsigned int mpidr) {} * cpu topology table */ struct cputopo_arm cpu_topology[NR_CPUS]; +EXPORT_SYMBOL_GPL(cpu_topology); const struct cpumask *cpu_coregroup_mask(int cpu) { diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig index 8aac82faa67..7b2ebc29ce3 100644 --- a/arch/arm/mach-vexpress/Kconfig +++ b/arch/arm/mach-vexpress/Kconfig @@ -1,5 +1,6 @@ config ARCH_VEXPRESS bool "ARM Ltd. Versatile Express family" if ARCH_MULTI_V7 + select ARCH_HAS_CPUFREQ select ARCH_REQUIRE_GPIOLIB select ARM_AMBA select ARM_GIC |