hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'synaptics-rmi4' into for-linus 

This brings in fix for F03 build error when serio is module.
This commit is contained in:
Dmitry Torokhov 2016-12-29 10:08:49 -08:00
parent b6fc513da5 d7ddad0acc
commit 72f0991354
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/input/rmi4/Kconfig
View File

@ -41,7 +41,8 @@ config RMI4_SMB
config RMI4_F03
bool "RMI4 Function 03 (PS2 Guest)"
depends on RMI4_CORE && SERIO
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.