commit c8b97ccfe9742854d74edf233c0280b096dedbd7
author Linux Build Service Account <lnxbuild@localhost> Wed Apr 02 09:22:33 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Apr 02 09:22:30 2014 -0700
tree 94cad126c41ad5090ffd7d0750733c201875db8f
parent 827b78d467eecdbbf4d5faab3b8ddcf7b13b332a
parent 5e0dbcf93002ece1dab1a762e745d6cd3a98de09

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

arch/arm/configs/msm8974-perf_defconfig

diff --git a/arch/arm/configs/msm8974-perf_defconfig b/arch/arm/configs/msm8974-perf_defconfig
index b0dbb5e..a749766 100755
--- a/arch/arm/configs/msm8974-perf_defconfig
+++ b/arch/arm/configs/msm8974-perf_defconfig
@@ -298,8 +298,8 @@
 CONFIG_INPUT_HBTP_INPUT=y
 CONFIG_INPUT_UINPUT=y
 CONFIG_SERIAL_MSM_HS=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_DIAG_CHAR=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_MSM=y