diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 17:51:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 17:51:50 -0700 |
| commit | 4416b0eaa3d51f3e360d6e171e603ff51848bcf5 (patch) | |
| tree | 1fa54240a606bc34a35e2eb99f06e91ec269fc01 /drivers/cpufreq/Makefile | |
| parent | Merge branch 'pcmcia' of git://git.linaro.org/people/rmk/linux-arm (diff) | |
| parent | Merge branch 'for_3.4/cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes (diff) | |
| download | linux-dev-4416b0eaa3d51f3e360d6e171e603ff51848bcf5.tar.xz linux-dev-4416b0eaa3d51f3e360d6e171e603ff51848bcf5.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
Pull cpufreq fixes from Dave Jones:
"I meant to get some of these in for 3.3 final, but left things too
late, so I've got two trees this time."
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
cpufreq: OMAP: specify range for voltage scaling
cpufreq: OMAP: scale voltage along with frequency
cpufreq: OMAP driver depends CPUfreq tables
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 |