Merge "defconfig: sdm670: update re-ordered configurations" (28b12c12) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/configs/sdm670_defconfig

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -265,7 +265,6 @@ CONFIG_NETDEVICES=y
	CONFIG_BONDING=y		CONFIG_BONDING=y
	CONFIG_DUMMY=y		CONFIG_DUMMY=y
	CONFIG_TUN=y		CONFIG_TUN=y
	CONFIG_RNDIS_IPA=y
	CONFIG_PPP=y		CONFIG_PPP=y
	CONFIG_PPP_BSDCOMP=y		CONFIG_PPP_BSDCOMP=y
	CONFIG_PPP_DEFLATE=y		CONFIG_PPP_DEFLATE=y
	@@ -333,7 +332,6 @@ CONFIG_QTI_THERMAL_LIMITS_DCVS=y
	CONFIG_QTI_VIRTUAL_SENSOR=y		CONFIG_QTI_VIRTUAL_SENSOR=y
	CONFIG_MFD_I2C_PMIC=y		CONFIG_MFD_I2C_PMIC=y
	CONFIG_MFD_SPMI_PMIC=y		CONFIG_MFD_SPMI_PMIC=y
	CONFIG_WCD934X_CODEC=y
	CONFIG_REGULATOR_FIXED_VOLTAGE=y		CONFIG_REGULATOR_FIXED_VOLTAGE=y
	CONFIG_REGULATOR_CPRH_KBSS=y		CONFIG_REGULATOR_CPRH_KBSS=y
	CONFIG_REGULATOR_QPNP_LABIBB=y		CONFIG_REGULATOR_QPNP_LABIBB=y
	@@ -445,6 +443,7 @@ CONFIG_ION_MSM=y
	CONFIG_GSI=y		CONFIG_GSI=y
	CONFIG_IPA3=y		CONFIG_IPA3=y
	CONFIG_RMNET_IPA3=y		CONFIG_RMNET_IPA3=y
			CONFIG_RNDIS_IPA=y
	CONFIG_IPA_UT=y		CONFIG_IPA_UT=y
	CONFIG_SPS=y		CONFIG_SPS=y
	CONFIG_SPS_SUPPORT_NDP_BAM=y		CONFIG_SPS_SUPPORT_NDP_BAM=y
	@@ -573,7 +572,6 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
	CONFIG_DEBUG_STACK_USAGE=y		CONFIG_DEBUG_STACK_USAGE=y
	CONFIG_DEBUG_MEMORY_INIT=y		CONFIG_DEBUG_MEMORY_INIT=y
	CONFIG_LOCKUP_DETECTOR=y		CONFIG_LOCKUP_DETECTOR=y
	CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
	CONFIG_WQ_WATCHDOG=y		CONFIG_WQ_WATCHDOG=y
	CONFIG_PANIC_TIMEOUT=5		CONFIG_PANIC_TIMEOUT=5
	CONFIG_PANIC_ON_SCHED_BUG=y		CONFIG_PANIC_ON_SCHED_BUG=y