diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 06:13:00 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 06:13:00 -0400 |
| commit | 9ae21ca362679757786f5abe556c7943e9001426 (patch) | |
| tree | db4ab371195fed9d327745eaf12c912f3f74f0e2 /arch/arm/Kconfig | |
| parent | 12ba8d1e9262ce81a695795410bd9ee5c9407ba1 (diff) | |
| parent | a3484ffd2acc196ca934369395fe9aac63ed1a47 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index bf7273f3dc64..9b2ef2fb3cae 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -1669,6 +1669,12 @@ if ARCH_HAS_CPUFREQ | |||
| 1669 | 1669 | ||
| 1670 | source "drivers/cpufreq/Kconfig" | 1670 | source "drivers/cpufreq/Kconfig" |
| 1671 | 1671 | ||
| 1672 | config CPU_FREQ_IMX | ||
| 1673 | tristate "CPUfreq driver for i.MX CPUs" | ||
| 1674 | depends on ARCH_MXC && CPU_FREQ | ||
| 1675 | help | ||
| 1676 | This enables the CPUfreq driver for i.MX CPUs. | ||
| 1677 | |||
| 1672 | config CPU_FREQ_SA1100 | 1678 | config CPU_FREQ_SA1100 |
| 1673 | bool | 1679 | bool |
| 1674 | 1680 | ||