diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-09 11:58:05 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-09 11:58:05 -0800 |
commit | 99378fd26803328cbab64ae60fa98e1394d07a6d (patch) | |
tree | 1ab2771c56963fec8669ac87c7058c84345365c4 /drivers/input/rmi4/Kconfig | |
parent | 189addce85330208bea50ea7f1483b58822e93cf (diff) | |
parent | 413d37326700aaf708730b940b04192c36e13ef4 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"A fix for a crash in uinput, and a fix for build errors when HID-RMI
is built-in but SERIO is a module"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: synaptics-rmi4 - select 'SERIO' when needed
Input: uinput - fix crash when mixing old and new init style
Diffstat (limited to 'drivers/input/rmi4/Kconfig')
-rw-r--r-- | drivers/input/rmi4/Kconfig | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/input/rmi4/Kconfig b/drivers/input/rmi4/Kconfig index 8993983e3fe4..bb7762bf2879 100644 --- a/drivers/input/rmi4/Kconfig +++ b/drivers/input/rmi4/Kconfig @@ -42,13 +42,19 @@ config RMI4_SMB config RMI4_F03 bool "RMI4 Function 03 (PS2 Guest)" depends on RMI4_CORE - depends on SERIO=y || RMI4_CORE=SERIO help Say Y here if you want to add support for RMI4 function 03. Function 03 provides PS2 guest support for RMI4 devices. This includes support for TrackPoints on TouchPads. +config RMI4_F03_SERIO + tristate + depends on RMI4_CORE + depends on RMI4_F03 + default RMI4_CORE + select SERIO + config RMI4_2D_SENSOR bool depends on RMI4_CORE |