Merge "defconfig: msmzirc: enable IPA driver" (22f0a303) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/configs/msmzirc_defconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ CONFIG_ARCH_MSM=y
		CONFIG_ARCH_MSMZIRC=y
		# CONFIG_MSM_STACKED_MEMORY is not set
		CONFIG_CPU_HAS_L2_PMU=y
		CONFIG_MSM_DLOAD_MODE=y
		CONFIG_MSM_UARTDM_Core_v14=y
		CONFIG_MSM_BOOT_STATS=y
		CONFIG_PREEMPT=y
		@@ -211,6 +210,7 @@ CONFIG_POWER_SUPPLY=y
		CONFIG_SMB135X_CHARGER=y
		CONFIG_POWER_RESET=y
		CONFIG_POWER_RESET_MSM=y
		CONFIG_MSM_DLOAD_MODE=y
		CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y
		CONFIG_THERMAL=y
		CONFIG_THERMAL_TSENS8974=y
		@@ -262,6 +262,7 @@ CONFIG_SPS_SUPPORT_NDP_BAM=y
		CONFIG_QPNP_POWER_ON=y
		CONFIG_QPNP_REVID=y
		CONFIG_MSM_BUS_SCALING=y
		CONFIG_IPA=y
		CONFIG_REMOTE_SPINLOCK_MSM=y
		CONFIG_CORESIGHT=y
		CONFIG_CORESIGHT_EVENT=y