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

Commit 0fc251ef authored Dec 11, 2016 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Dec 11, 2016

Merge "defconfig: msm: Disable Auto bus suspend"

parents 4f42664d 862ad4fb

arch/arm/configs/msm8909-perf_defconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -206,7 +206,6 @@ CONFIG_BT_BNEP_MC_FILTER=y
		CONFIG_BT_BNEP_PROTO_FILTER=y
		CONFIG_BT_HIDP=y
		CONFIG_CFG80211=y
		CONFIG_NL80211_TESTMODE=y
		CONFIG_CFG80211_INTERNAL_REGDB=y
		CONFIG_IPC_ROUTER=y
		CONFIG_IPC_ROUTER_SECURITY=y
		@@ -254,6 +253,8 @@ CONFIG_WCNSS_CORE_PRONTO=y
		CONFIG_WCNSS_REGISTER_DUMP_ON_BITE=y
		CONFIG_WCNSS_MEM_PRE_ALLOC=y
		CONFIG_CNSS_CRYPTO=y
		CONFIG_CNSS=y
		CONFIG_CLD_HL_SDIO_CORE=y
		CONFIG_INPUT_EVDEV=y
		CONFIG_INPUT_EVBUG=m
		CONFIG_KEYBOARD_GPIO=y

arch/arm64/configs/msm-perf_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -282,7 +282,6 @@ CONFIG_ATH_CARDS=y
		CONFIG_WIL6210=m
		CONFIG_CNSS=y
		CONFIG_CLD_LL_CORE=y
		CONFIG_BUS_AUTO_SUSPEND=y
		CONFIG_WLAN_FEATURE_RX_WAKELOCK=y
		CONFIG_INPUT_EVDEV=y
		CONFIG_INPUT_EVBUG=m

arch/arm64/configs/msm_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -283,7 +283,6 @@ CONFIG_ATH_CARDS=y
		CONFIG_WIL6210=m
		CONFIG_CNSS=y
		CONFIG_CLD_LL_CORE=y
		CONFIG_BUS_AUTO_SUSPEND=y
		CONFIG_WLAN_FEATURE_RX_WAKELOCK=y
		CONFIG_INPUT_EVDEV=y
		CONFIG_INPUT_EVBUG=m