Skip to content

L
linux
Commit 72f09913 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files
Options

Merge branch 'synaptics-rmi4' into for-linus 

This brings in fix for F03 build error when serio is module.
parents b6fc513d d7ddad0a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
drivers/input/rmi4/Kconfig
View file @ 72f09913
...@@ -41,7 +41,8 @@ config RMI4_SMB ...@@ -41,7 +41,8 @@ config RMI4_SMB
config RMI4_F03 config RMI4_F03
bool "RMI4 Function 03 (PS2 Guest)" bool "RMI4 Function 03 (PS2 Guest)"
depends on RMI4_CORE && SERIO depends on RMI4_CORE
depends on SERIO=y || RMI4_CORE=SERIO
help help
Say Y here if you want to add support for RMI4 function 03. Say Y here if you want to add support for RMI4 function 03.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7