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: b3f30fb)
ARM: multi_v7_defconfig: remove duplicate CONFIG_COMMON_CLK_QCOM=y
authorKevin Hilman <khilman@linaro.org>
Fri, 12 Jun 2015 20:30:53 +0000 (13:30 -0700)
committerKevin Hilman <khilman@linaro.org>
Fri, 12 Jun 2015 20:30:53 +0000 (13:30 -0700)
commit dcf9a03bff4e (ARM: multi_v7_defconfig: Enable PMIC and MUIC
drivers for exynos) mistakenly added an duplicate line for
CONFIG_COMMON_CLK_QCOM=y.  Remove it.

Signed-off-by: Kevin Hilman <khilman@linaro.org>
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 fa3cc0b9237723ea574dfa1ade0e537f26df3a0f..ba90cb5d053c8cc7ccfc79320d4da90150bb3d82 100644 (file)
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -603,7 +603,6 @@ CONFIG_CROS_EC_CHARDEV=m
 CONFIG_COMMON_CLK_MAX77686=y
 CONFIG_COMMON_CLK_MAX77802=m
 CONFIG_COMMON_CLK_S2MPS11=m
-CONFIG_COMMON_CLK_QCOM=y
 CONFIG_APQ_MMCC_8084=y
 CONFIG_MSM_GCC_8660=y
 CONFIG_MSM_MMCC_8960=y