diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-08-04 13:11:22 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-08-04 13:11:22 +0400 |
commit | 2e65b8916cce4436df29812610d2c2fecdb42b5a (patch) | |
tree | fdcae670bd651c8e772eb7cd60420eba5d26a0db /arch/arm/mach-spear/Kconfig | |
parent | 7440850c20b69658f322119d20a94dc914127cc7 (diff) | |
parent | 00ef99408b6cc8d86ca614ada8025aa3606860db (diff) | |
download | linux-2e65b8916cce4436df29812610d2c2fecdb42b5a.tar.xz |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'arch/arm/mach-spear/Kconfig')
-rw-r--r-- | arch/arm/mach-spear/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig index 0786249b2832..90df2022276a 100644 --- a/arch/arm/mach-spear/Kconfig +++ b/arch/arm/mach-spear/Kconfig @@ -14,7 +14,6 @@ if PLAT_SPEAR config ARCH_SPEAR13XX bool "ST SPEAr13xx" depends on ARCH_MULTI_V7 || PLAT_SPEAR_SINGLE - select ARCH_HAS_CPUFREQ select ARM_GIC select GPIO_SPEAR_SPICS select HAVE_ARM_SCU if SMP |