diff options
| author | Olof Johansson <olof@lixom.net> | 2016-11-18 10:37:32 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-11-18 10:37:32 +0300 |
| commit | 2ede7c7d9217ce45562288da52074508eb157e7c (patch) | |
| tree | 00aed9c89cc90cb938ab39063591e5d276a60912 /arch/arm/configs | |
| parent | b3ee82ba06f0f91d0d69e05fc9572ce1025a5038 (diff) | |
| parent | 206787737e308bb447d18adef7da7749188212f5 (diff) | |
| download | linux-2ede7c7d9217ce45562288da52074508eb157e7c.tar.xz | |
Merge tag 'qcom-defconfig-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/defconfig
Qualcomm ARM Based defconfig Updates for v4.10
* Fixup MDM9615 option names
* tag 'qcom-defconfig-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
ARM: qcom_defconfig: Fix MDM9515 LCC and GCC config
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/qcom_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig index c2dff4fd5fc4..9f6d2a69a6f7 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -162,8 +162,8 @@ CONFIG_APQ_MMCC_8084=y CONFIG_IPQ_LCC_806X=y CONFIG_MSM_GCC_8660=y CONFIG_MSM_LCC_8960=y -CONFIG_MSM_GCC_9615=y -CONFIG_MSM_LCC_9615=y +CONFIG_MDM_GCC_9615=y +CONFIG_MDM_LCC_9615=y CONFIG_MSM_MMCC_8960=y CONFIG_MSM_MMCC_8974=y CONFIG_HWSPINLOCK_QCOM=y |