Merge "defconfig: msm8974: Disable MSMSAMARIUM support"

arch/arm/configs/msm8974_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ CONFIG_IOSCHED_TEST=y
		CONFIG_DEFAULT_ROW=y
		CONFIG_ARCH_MSM=y
		CONFIG_ARCH_MSM8974=y
		CONFIG_ARCH_MSMSAMARIUM=y
		CONFIG_MSM_KRAIT_TBB_ABORT_HANDLER=y
		# CONFIG_MSM_STACKED_MEMORY is not set
		CONFIG_CPU_HAS_L2_PMU=y