summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-06-12 13:30:53 -0700
committerKevin Hilman <khilman@linaro.org>2015-06-12 13:30:53 -0700
commitdec36f6ab89db2ae80a0a61f26e1ca1f6a61b651 (patch)
tree1ea0aeafe192e57f8fe0222155e01eebe7356a76
parentb3f30fb41bd1387b6555ba4394c86a4cd1a6d635 (diff)
downloadlinux-dec36f6ab89db2ae80a0a61f26e1ca1f6a61b651.tar.bz2
ARM: multi_v7_defconfig: remove duplicate CONFIG_COMMON_CLK_QCOM=y
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>
-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 fa3cc0b92377..ba90cb5d053c 100644
--- 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