summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-09-26 13:42:11 +0200
committerArnd Bergmann <arnd@arndb.de>2014-09-26 13:42:11 +0200
commit6b74db0650b0aaca8550d283eca7dcc1dc2ba80f (patch)
treea92f8d2940825e5c9e565c3a39bc03380df6206b
parentbb25ce633d0621786526a2b7ad0d54468a55e986 (diff)
downloadblackbird-op-linux-6b74db0650b0aaca8550d283eca7dcc1dc2ba80f.tar.gz
blackbird-op-linux-6b74db0650b0aaca8550d283eca7dcc1dc2ba80f.zip
ARM: configs: fix duplicate entry in multi_v7
Two of the recent patches each added support for CPU_FREQ, which causes a kconfig warning: arch/arm/configs/multi_v7_defconfig:443:warning: override: reassigning to symbol CPU_FREQ This removes one of the two in order to avoid the warning. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/configs/multi_v7_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 1b0af30ef950..f5a30ca195da 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -439,5 +439,4 @@ CONFIG_DEBUG_FS=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_LOCKUP_DETECTOR=y
CONFIG_CRYPTO_DEV_TEGRA_AES=y
-CONFIG_CPU_FREQ=y
CONFIG_GENERIC_CPUFREQ_CPU0=y
OpenPOWER on IntegriCloud