projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bb25ce6)
ARM: configs: fix duplicate entry in multi_v7
authorArnd Bergmann <arnd@arndb.de>
Fri, 26 Sep 2014 11:42:11 +0000 (13:42 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 26 Sep 2014 11:42:11 +0000 (13:42 +0200)
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>
arch/arm/configs/multi_v7_defconfig patch | blob | blame | history

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 1b0af30ef950b1d00257e3fa71d35672feb01956..f5a30ca195dafec6ae407c30cf6c5a3224aa0b99 100644 (file)
--- 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