diff options
| author | Olof Johansson <olof@lixom.net> | 2015-04-01 17:38:19 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-04-01 17:38:19 -0700 |
| commit | 80737123e934547e32502c707c67c12cbfd9e8fb (patch) | |
| tree | c1c8b5d99a291f7c0174d54e7826accbb5179b22 /arch/arm/configs | |
| parent | a90c13819b17fed8ccbaaeb15433a86c87709df0 (diff) | |
| parent | 9e0388c3188c602fafdbfff46ca976de32a8008f (diff) | |
Merge tag 'qcom-defconfig-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/defconfig
Merge "qcom defconfig changes for v4.1" from Kumar Gala:
Qualcomm ARM Based defconfig Updates for v4.1
* Enable LPASS clock support for IPQ806x in defconfig
* Update qcom_defconfig to select GPIOLIB
* tag 'qcom-defconfig-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
arm: qcom: Update defconfig
arm: qcom: Enable lpass clock driver in defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/qcom_defconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig index 8c7da3319d82..2de999338df0 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -97,9 +97,9 @@ CONFIG_PINCTRL_APQ8084=y CONFIG_PINCTRL_IPQ8064=y CONFIG_PINCTRL_MSM8960=y CONFIG_PINCTRL_MSM8X74=y +CONFIG_GPIOLIB=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y -CONFIG_POWER_SUPPLY=y CONFIG_POWER_RESET=y CONFIG_POWER_RESET_MSM=y CONFIG_THERMAL=y @@ -134,14 +134,15 @@ CONFIG_RTC_CLASS=y CONFIG_DMADEVICES=y CONFIG_QCOM_BAM_DMA=y CONFIG_STAGING=y -CONFIG_QCOM_GSBI=y CONFIG_COMMON_CLK_QCOM=y CONFIG_APQ_MMCC_8084=y -CONFIG_IPQ_GCC_806X=y +CONFIG_IPQ_LCC_806X=y CONFIG_MSM_GCC_8660=y +CONFIG_MSM_LCC_8960=y CONFIG_MSM_MMCC_8960=y CONFIG_MSM_MMCC_8974=y CONFIG_MSM_IOMMU=y +CONFIG_QCOM_GSBI=y CONFIG_PHY_QCOM_APQ8064_SATA=y CONFIG_PHY_QCOM_IPQ806X_SATA=y CONFIG_EXT2_FS=y |