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

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

Merge "defconfig: msmferrum: enable Synaptics V2 driver"

parents 498c35a9 26b8e681

arch/arm/configs/msmferrum-1gb_defconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -235,6 +235,9 @@ CONFIG_KEYBOARD_GPIO=y 
CONFIG_INPUT_JOYSTICK=y

CONFIG_INPUT_JOYSTICK=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE_v21=y

CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI_DEV_v21=y

CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v21=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=y

CONFIG_TOUCHSCREEN_FT5X06=y

CONFIG_TOUCHSCREEN_FT5X06=y

CONFIG_TOUCHSCREEN_GEN_VKEYS=y

CONFIG_TOUCHSCREEN_GEN_VKEYS=y

arch/arm/configs/msmferrum_defconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -260,6 +260,9 @@ CONFIG_KEYBOARD_GPIO=y 
CONFIG_INPUT_JOYSTICK=y

CONFIG_INPUT_JOYSTICK=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE_v21=y

CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI_DEV_v21=y

CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v21=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=y

CONFIG_TOUCHSCREEN_FT5X06=y

CONFIG_TOUCHSCREEN_FT5X06=y

CONFIG_TOUCHSCREEN_GEN_VKEYS=y

CONFIG_TOUCHSCREEN_GEN_VKEYS=y