diff options
| author | Jon Medhurst <tixy@linaro.org> | 2012-07-18 19:42:23 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2012-07-18 19:42:23 +0100 |
| commit | f69fcd3559e2b05b4a311b054233488e566a1f29 (patch) | |
| tree | f573fc957325b65683ac3846dcd1c89fe23881cd /drivers/cpufreq/Makefile | |
| parent | 2612181026933f4c72a76e3a0239915a322c0973 (diff) | |
| parent | e1a9cc09f7888e4787c0b12a8f9ea5676904d62a (diff) | |
| download | vexpress-a9-f69fcd3559e2b05b4a311b054233488e566a1f29.tar.gz | |
Merge branch 'tracking-armlt-tc2-pm' of git://git.linaro.org/landing-teams/working/arm/kernel into armlt-linaro-android-3.5armlt-linaro-android-3.5-20120718armlt-linaro-android-3.5
Conflicts:
drivers/cpuidle/coupled.c
drivers/misc/Kconfig
drivers/misc/Makefile
Diffstat (limited to 'drivers/cpufreq/Makefile')
| -rw-r--r-- | drivers/cpufreq/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index 35835b7cc2d..478c08b795f 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -49,6 +49,7 @@ obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += exynos4210-cpufreq.o obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ) += exynos5250-cpufreq.o obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o +obj-$(CONFIG_ARM_VEXPRESS_BL_CPUFREQ) += vexpress_bL_cpufreq.o ################################################################################## # PowerPC platform drivers |