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

This project is archived. Its data is read-only.

Commit ccf3c894 authored Jan 07, 2017 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Jan 07, 2017

Merge "input: move qpnp-power-on driver into input/misc directory"

parents ad65eb09 07f2f995

arch/arm/configs/msmcortex_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -254,7 +254,6 @@ CONFIG_PPPOPNS=y
		CONFIG_WCNSS_MEM_PRE_ALLOC=y
		CONFIG_ATH_CARDS=y
		CONFIG_CLD_LL_CORE=y
		CONFIG_QPNP_POWER_ON=y
		CONFIG_INPUT_EVDEV=y
		CONFIG_INPUT_KEYRESET=y
		CONFIG_KEYBOARD_GPIO=y
		@@ -266,6 +265,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v21=y
		CONFIG_SECURE_TOUCH=y
		CONFIG_INPUT_MISC=y
		CONFIG_INPUT_HBTP_INPUT=y
		CONFIG_INPUT_QPNP_POWER_ON=y
		CONFIG_INPUT_KEYCHORD=y
		CONFIG_INPUT_UINPUT=y
		CONFIG_INPUT_GPIO=y

arch/arm/configs/sdm660-perf_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -280,7 +280,6 @@ CONFIG_USB_USBNET=y
		CONFIG_WCNSS_MEM_PRE_ALLOC=y
		CONFIG_ATH_CARDS=y
		CONFIG_CLD_LL_CORE=y
		CONFIG_QPNP_POWER_ON=y
		CONFIG_INPUT_EVDEV=y
		CONFIG_INPUT_KEYRESET=y
		CONFIG_KEYBOARD_GPIO=y
		@@ -292,6 +291,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v21=y
		CONFIG_SECURE_TOUCH=y
		CONFIG_INPUT_MISC=y
		CONFIG_INPUT_HBTP_INPUT=y
		CONFIG_INPUT_QPNP_POWER_ON=y
		CONFIG_INPUT_KEYCHORD=y
		CONFIG_INPUT_UINPUT=y
		CONFIG_INPUT_GPIO=y

arch/arm/configs/sdm660_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -279,7 +279,6 @@ CONFIG_USB_USBNET=y
		CONFIG_WCNSS_MEM_PRE_ALLOC=y
		CONFIG_ATH_CARDS=y
		CONFIG_CLD_LL_CORE=y
		CONFIG_QPNP_POWER_ON=y
		CONFIG_INPUT_EVDEV=y
		CONFIG_INPUT_KEYRESET=y
		CONFIG_KEYBOARD_GPIO=y
		@@ -291,6 +290,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v21=y
		CONFIG_SECURE_TOUCH=y
		CONFIG_INPUT_MISC=y
		CONFIG_INPUT_HBTP_INPUT=y
		CONFIG_INPUT_QPNP_POWER_ON=y
		CONFIG_INPUT_KEYCHORD=y
		CONFIG_INPUT_UINPUT=y
		CONFIG_INPUT_GPIO=y

arch/arm64/configs/msm-perf_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -279,7 +279,6 @@ CONFIG_WIL6210=m
		CONFIG_CNSS=y
		CONFIG_CLD_LL_CORE=y
		CONFIG_BUS_AUTO_SUSPEND=y
		CONFIG_QPNP_POWER_ON=y
		CONFIG_INPUT_EVDEV=y
		CONFIG_INPUT_KEYRESET=y
		CONFIG_KEYBOARD_GPIO=y
		@@ -293,6 +292,7 @@ CONFIG_SECURE_TOUCH=y
		CONFIG_TOUCHSCREEN_GEN_VKEYS=y
		CONFIG_INPUT_MISC=y
		CONFIG_INPUT_HBTP_INPUT=y
		CONFIG_INPUT_QPNP_POWER_ON=y
		CONFIG_INPUT_KEYCHORD=y
		CONFIG_INPUT_UINPUT=y
		CONFIG_INPUT_GPIO=y

arch/arm64/configs/msm_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -265,7 +265,6 @@ CONFIG_WIL6210=m
		CONFIG_CNSS=y
		CONFIG_CLD_LL_CORE=y
		CONFIG_BUS_AUTO_SUSPEND=y
		CONFIG_QPNP_POWER_ON=y
		CONFIG_INPUT_EVDEV=y
		CONFIG_INPUT_KEYRESET=y
		CONFIG_KEYBOARD_GPIO=y
		@@ -280,6 +279,7 @@ CONFIG_SECURE_TOUCH=y
		CONFIG_TOUCHSCREEN_GEN_VKEYS=y
		CONFIG_INPUT_MISC=y
		CONFIG_INPUT_HBTP_INPUT=y
		CONFIG_INPUT_QPNP_POWER_ON=y
		CONFIG_INPUT_UINPUT=y
		CONFIG_INPUT_GPIO=y
		# CONFIG_SERIO_SERPORT is not set