summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-05-15 03:51:20 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-05-15 03:51:20 -0700
commit3c50776b05d0646498e68b382c495ccf8f2d20f5 (patch)
tree870283ad7d6fbfcd092a3d9054500088e4ed21c3
parent696b2e8fbe14f3700cd19aa79456f9eb375155cd (diff)
parent092564d2a8c252b873c9357494531f2e4d8e3178 (diff)
Merge "defconfig: msmcortex: Cleanup"
-rw-r--r--arch/arm/configs/msmcortex_defconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/msmcortex_defconfig b/arch/arm/configs/msmcortex_defconfig
index 1658cc992ee6..45aa719252d4 100644
--- a/arch/arm/configs/msmcortex_defconfig
+++ b/arch/arm/configs/msmcortex_defconfig
@@ -224,7 +224,6 @@ CONFIG_ZRAM=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_UID_CPUTIME=y
CONFIG_MSM_ULTRASOUND=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
@@ -294,7 +293,6 @@ CONFIG_PINCTRL_SDM660=y
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_QPNP_PIN=y
CONFIG_POWER_SUPPLY=y
-CONFIG_QPNP_SMBCHARGER=y
CONFIG_SMB135X_CHARGER=y
CONFIG_SMB1351_USB_CHARGER=y
CONFIG_MSM_BCL_CTL=y