diff options
author | Dave Jones <davej@redhat.com> | 2012-03-08 00:27:02 +0400 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2012-03-08 00:27:02 +0400 |
commit | 6139b652c89ecd5ebf72ef895fec9f6d0d320cb1 (patch) | |
tree | 786c7a9609699300d7f5aaa99c68f816e9831b64 /drivers/cpufreq/Makefile | |
parent | 88ebdda6159ffc15699f204c33feb3e431bf9bdc (diff) | |
parent | 42daffd2d6c665716d442d518022ecaad17ddf64 (diff) | |
download | linux-6139b652c89ecd5ebf72ef895fec9f6d0d320cb1.tar.xz |
Merge branch 'for_3.4/cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes
Diffstat (limited to 'drivers/cpufreq/Makefile')
-rw-r--r-- | drivers/cpufreq/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index ac000fa76bbb..fda94c74eab0 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -44,7 +44,7 @@ obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o obj-$(CONFIG_ARM_EXYNOS_CPUFREQ) += exynos-cpufreq.o obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += exynos4210-cpufreq.o -obj-$(CONFIG_ARCH_OMAP2PLUS) += omap-cpufreq.o +obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o ################################################################################## # PowerPC platform drivers |