Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52a8226d authored Dec 16, 2014 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Dec 16, 2014

Merge "defconfig: msm: disable serial console in 8909 perf defconfig"

parents 763728c1 4d52a395

arch/arm/configs/msm8909-1gb-perf_defconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -294,8 +294,8 @@ CONFIG_SENSORS_MMC3416X=y
		CONFIG_SENSORS_AKM8963=y
		CONFIG_SENSORS_BMA2X2=y
		CONFIG_SENSORS_AP3426=y
		CONFIG_SERIAL_MSM_HSL=y
		CONFIG_SERIAL_MSM_HSL_CONSOLE=y
		#CONFIG_SERIAL_MSM_HSL is not set
		#CONFIG_SERIAL_MSM_HSL_CONSOLE is not set
		CONFIG_SERIAL_MSM_SMD=y
		CONFIG_DIAG_CHAR=y
		CONFIG_HW_RANDOM=y

arch/arm/configs/msm8909-perf_defconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -293,8 +293,8 @@ CONFIG_SENSORS_MMC3416X=y
		CONFIG_SENSORS_AKM8963=y
		CONFIG_SENSORS_BMA2X2=y
		CONFIG_SENSORS_AP3426=y
		CONFIG_SERIAL_MSM_HSL=y
		CONFIG_SERIAL_MSM_HSL_CONSOLE=y
		#CONFIG_SERIAL_MSM_HSL is not set
		#CONFIG_SERIAL_MSM_HSL_CONSOLE is not set
		CONFIG_SERIAL_MSM_SMD=y
		CONFIG_DIAG_CHAR=y
		CONFIG_HW_RANDOM=y