diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:07:09 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:07:09 +0100 |
| commit | 491eed6a04bd3bd11b888ec4a8cb923edc164552 (patch) | |
| tree | 2d1198a44d9a08722c8b6b1af50aea9dfc4ad7a0 /arch | |
| parent | 4b460cf013ef6b158d870f5d5dff7989535f5aac (diff) | |
| parent | be19b71b407ca8fbf196814a65bfa1a99bda3370 (diff) | |
Merge branch 'tracking-armlt-tc2-cpufreq' into lsk-3.9-vexpresstracking-lsk-vexpress-lsk-20130512.0
Diffstat (limited to 'arch')
| -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 79282ebcd93..606b95383d9 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> @@ -200,6 +201,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 |