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

Commit 25d15ba1 authored May 29, 2017 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server May 29, 2017

Merge "defconfig: msm8909-1gb: Disable NFC legacy driver"

parents f49e9ab7 f2d25459

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -240,7 +240,8 @@ CONFIG_BT_HIDP=y
		CONFIG_CFG80211=y
		CONFIG_NL80211_TESTMODE=y
		CONFIG_CFG80211_INTERNAL_REGDB=y
		CONFIG_NFC_QNCI=y
		# CONFIG_NFC_QNCI=y
		# CONFIG_NFC_NQ=y
		CONFIG_IPC_ROUTER=y
		CONFIG_IPC_ROUTER_SECURITY=y
		CONFIG_CMA=y

arch/arm/configs/msm8909-1gb_defconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -246,7 +246,8 @@ CONFIG_BT_HIDP=y
		CONFIG_CFG80211=y
		CONFIG_NL80211_TESTMODE=y
		CONFIG_CFG80211_INTERNAL_REGDB=y
		CONFIG_NFC_QNCI=y
		# CONFIG_NFC_QNCI=y
		# CONFIG_NFC_NQ=y
		CONFIG_IPC_ROUTER=y
		CONFIG_IPC_ROUTER_SECURITY=y
		CONFIG_CMA=y