diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-08 15:08:49 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-08 15:08:59 -0800 |
| commit | 96e61b8e34ea4982ce57319c19ab73e9e5d74165 (patch) | |
| tree | 5a92e274069225396051e3b12d6b82d6cdd8175b /drivers/cpufreq/Makefile | |
| parent | d1c3ed669a2d452cacfb48c2d171a1f364dae2ed (diff) | |
| parent | ec6691239373395d64fb73f50444f09a6f29d5ef (diff) | |
Merge tag 'ux500-cpufreq-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/drivers
From Linus Walleij:
These are cpufreq updates for the ux500
- Updates to the ux500 cpufreq driver
- Support for delay timers in the MTU clksrc
- Consequential updates to the cpufreq driver
* tag 'ux500-cpufreq-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
cpufreq: db8500: set CPUFREQ_CONST_LOOPS
clocksource: nomadik-mtu: support timer-based delay
cpufreq: dbx500: Update file header
cpufreq: dbx500: Minor code cleanup
cpufreq: dbx500: Move clk_get to probe
mfd: db8500: Update cpufreq device name
cpufreq: Give driver used for dbx500 family a more generic name
Signed-off-by: Olof Johansson <olof@lixom.net>
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 1f254ec087c..6700251f7e9 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -41,7 +41,7 @@ obj-$(CONFIG_X86_CPUFREQ_NFORCE2) += cpufreq-nforce2.o ################################################################################## # ARM SoC drivers -obj-$(CONFIG_UX500_SOC_DB8500) += db8500-cpufreq.o +obj-$(CONFIG_UX500_SOC_DB8500) += dbx500-cpufreq.o obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o |