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

Commit 3f9354b6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: enable secure touch option for Focaltech touch driver"

parents 59984de7 fde27231

arch/arm/configs/msm8937-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -290,9 +290,9 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE_v26=y 
CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI_DEV_v26=y

CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v26=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=y

CONFIG_SECURE_TOUCH=y

CONFIG_TOUCHSCREEN_GEN_VKEYS=y

CONFIG_TOUCHSCREEN_FT5X06=y

CONFIG_FT_SECURE_TOUCH=y

CONFIG_TOUCHSCREEN_MAXIM_STI=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_HBTP_INPUT=y

arch/arm/configs/msm8937_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -292,9 +292,9 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE_v26=y 
CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI_DEV_v26=y

CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v26=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=y

CONFIG_SECURE_TOUCH=y

CONFIG_TOUCHSCREEN_GEN_VKEYS=y

CONFIG_TOUCHSCREEN_FT5X06=y

CONFIG_FT_SECURE_TOUCH=y

CONFIG_TOUCHSCREEN_MAXIM_STI=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_HBTP_INPUT=y

arch/arm64/configs/msm8937-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v26=y 
CONFIG_TOUCHSCREEN_ATMEL_MXT=y

CONFIG_TOUCHSCREEN_GEN_VKEYS=y

CONFIG_TOUCHSCREEN_FT5X06=y

CONFIG_FT_SECURE_TOUCH=y

CONFIG_TOUCHSCREEN_MAXIM_STI=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_HBTP_INPUT=y

arch/arm64/configs/msm8937_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v26=y 
CONFIG_TOUCHSCREEN_ATMEL_MXT=y

CONFIG_TOUCHSCREEN_GEN_VKEYS=y

CONFIG_TOUCHSCREEN_FT5X06=y

CONFIG_FT_SECURE_TOUCH=y

CONFIG_TOUCHSCREEN_MAXIM_STI=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_HBTP_INPUT=y