From c8642cac6a0d8274b125bc8541463a7c9cf51a2d Mon Sep 17 00:00:00 2001 From: Subbaraman Narayanamurthy Date: Fri, 11 Mar 2016 16:39:39 -0800 Subject: [PATCH] defconfig: fix defconfig mismatch Auto update for the mismatch seen with following defconfigs. - msm_defconfig - msm-perf_defconfig - msm_cortex_defconfig - msm_cortex-perf_defconfig Change-Id: Ic702802d48465011b5c15a862c0d12e8536c5139 Signed-off-by: Subbaraman Narayanamurthy --- arch/arm64/configs/msm-perf_defconfig | 8 ++++---- arch/arm64/configs/msm_defconfig | 8 ++++---- arch/arm64/configs/msmcortex-perf_defconfig | 6 +++--- arch/arm64/configs/msmcortex_defconfig | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arm64/configs/msm-perf_defconfig b/arch/arm64/configs/msm-perf_defconfig index a2e800ade871..bf0f8e7984c6 100644 --- a/arch/arm64/configs/msm-perf_defconfig +++ b/arch/arm64/configs/msm-perf_defconfig @@ -304,16 +304,16 @@ CONFIG_PINCTRL_MSM8996=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_QPNP_PIN=y +CONFIG_QPNP_SMBCHARGER=y +CONFIG_QPNP_FG=y +CONFIG_SMB135X_CHARGER=y +CONFIG_SMB1351_USB_CHARGER=y CONFIG_POWER_RESET_QCOM=y CONFIG_QCOM_DLOAD_MODE=y CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y CONFIG_MSM_PM=y CONFIG_MSM_APM=y -CONFIG_QPNP_SMBCHARGER=y -CONFIG_QPNP_FG=y -CONFIG_SMB135X_CHARGER=y -CONFIG_SMB1351_USB_CHARGER=y CONFIG_SENSORS_EPM_ADC=y CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y CONFIG_THERMAL_TSENS8974=y diff --git a/arch/arm64/configs/msm_defconfig b/arch/arm64/configs/msm_defconfig index 7d26415086a7..75ff8baba686 100644 --- a/arch/arm64/configs/msm_defconfig +++ b/arch/arm64/configs/msm_defconfig @@ -316,16 +316,16 @@ CONFIG_PINCTRL_MSM8996=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_QPNP_PIN=y +CONFIG_QPNP_SMBCHARGER=y +CONFIG_QPNP_FG=y +CONFIG_SMB135X_CHARGER=y +CONFIG_SMB1351_USB_CHARGER=y CONFIG_POWER_RESET_QCOM=y CONFIG_QCOM_DLOAD_MODE=y CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y CONFIG_MSM_PM=y CONFIG_MSM_APM=y -CONFIG_QPNP_SMBCHARGER=y -CONFIG_QPNP_FG=y -CONFIG_SMB135X_CHARGER=y -CONFIG_SMB1351_USB_CHARGER=y CONFIG_SENSORS_EPM_ADC=y CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y CONFIG_THERMAL_TSENS8974=y diff --git a/arch/arm64/configs/msmcortex-perf_defconfig b/arch/arm64/configs/msmcortex-perf_defconfig index 1c62c5f8e3c7..ab3543360203 100644 --- a/arch/arm64/configs/msmcortex-perf_defconfig +++ b/arch/arm64/configs/msmcortex-perf_defconfig @@ -132,12 +132,12 @@ CONFIG_PINCTRL_MSMCOBALT=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_QPNP_PIN=y -CONFIG_POWER_RESET_XGENE=y -CONFIG_POWER_RESET_SYSCON=y -CONFIG_MSM_APM=y CONFIG_QPNP_SMBCHARGER=y CONFIG_SMB135X_CHARGER=y CONFIG_SMB1351_USB_CHARGER=y +CONFIG_POWER_RESET_XGENE=y +CONFIG_POWER_RESET_SYSCON=y +CONFIG_MSM_APM=y # CONFIG_HWMON is not set CONFIG_MFD_SPMI_PMIC=y CONFIG_REGULATOR=y diff --git a/arch/arm64/configs/msmcortex_defconfig b/arch/arm64/configs/msmcortex_defconfig index 23cbac2625dc..de8024cba158 100644 --- a/arch/arm64/configs/msmcortex_defconfig +++ b/arch/arm64/configs/msmcortex_defconfig @@ -146,14 +146,14 @@ CONFIG_PINCTRL_MSMCOBALT=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_QPNP_PIN=y +CONFIG_QPNP_SMBCHARGER=y +CONFIG_SMB135X_CHARGER=y +CONFIG_SMB1351_USB_CHARGER=y CONFIG_POWER_RESET_QCOM=y CONFIG_QCOM_DLOAD_MODE=y CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y CONFIG_MSM_APM=y -CONFIG_QPNP_SMBCHARGER=y -CONFIG_SMB135X_CHARGER=y -CONFIG_SMB1351_USB_CHARGER=y # CONFIG_HWMON is not set CONFIG_MFD_SPMI_PMIC=y CONFIG_REGULATOR=y