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

Merge branch 'synaptics-rmi4' into for-linus 

This brings in fix for F03 build error when serio is module.
parents b6fc513d d7ddad0a

drivers/input/rmi4/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -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.