diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2012-04-19 22:06:26 +0200 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-04-19 22:06:26 +0200 |
| commit | eac0556750e727ff39144a9a9e59d5ccf1fc0e2a (patch) | |
| tree | f5ccff7795b2ad5e47f17fb475599c526f533e79 /drivers/cpufreq/Kconfig.arm | |
| parent | KVM: MMU: use page table level macro (diff) | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| download | linux-eac0556750e727ff39144a9a9e59d5ccf1fc0e2a.tar.xz linux-eac0556750e727ff39144a9a9e59d5ccf1fc0e2a.zip | |
Merge branch 'linus' into queue
Merge reason: development work has dependency on kvm patches merged
upstream.
Conflicts:
Documentation/feature-removal-schedule.txt
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'drivers/cpufreq/Kconfig.arm')
| -rw-r--r-- | drivers/cpufreq/Kconfig.arm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index ffbb44685915..5961e6415f08 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -4,6 +4,7 @@ config ARM_OMAP2PLUS_CPUFREQ bool "TI OMAP2+" + depends on ARCH_OMAP2PLUS default ARCH_OMAP2PLUS select CPU_FREQ_TABLE |