projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-f2fs-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...
[cascardo/linux.git]
/
drivers
/
cpufreq
/
Kconfig.arm
diff --git
a/drivers/cpufreq/Kconfig.arm
b/drivers/cpufreq/Kconfig.arm
index
ebac671
..
7364a53
100644
(file)
--- a/
drivers/cpufreq/Kconfig.arm
+++ b/
drivers/cpufreq/Kconfig.arm
@@
-104,6
+104,7
@@
config ARM_IMX6Q_CPUFREQ
tristate "Freescale i.MX6 cpufreq support"
depends on ARCH_MXC
depends on REGULATOR_ANATOP
tristate "Freescale i.MX6 cpufreq support"
depends on ARCH_MXC
depends on REGULATOR_ANATOP
+ select PM_OPP
help
This adds cpufreq driver support for Freescale i.MX6 series SoCs.
help
This adds cpufreq driver support for Freescale i.MX6 series SoCs.
@@
-118,7
+119,7
@@
config ARM_INTEGRATOR
If in doubt, say Y.
config ARM_KIRKWOOD_CPUFREQ
If in doubt, say Y.
config ARM_KIRKWOOD_CPUFREQ
- def_bool MACH_KIRKWOOD
+ def_bool
ARCH_KIRKWOOD ||
MACH_KIRKWOOD
help
This adds the CPUFreq driver for Marvell Kirkwood
SoCs.
help
This adds the CPUFreq driver for Marvell Kirkwood
SoCs.