Merge branch 'synaptics-rmi4' into for-linus

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

Merge branch 'synaptics-rmi4' into for-linus
This brings in fix for F03 build error when serio is module.
72f09913 · Dmitry Torokhov · b6fc513d · d7ddad0a · 72f09913
Commit 72f09913 authored Dec 29, 2016 by Dmitry Torokhov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

drivers/input/rmi4/Kconfig drivers/input/rmi4/Kconfig +2 -1

No files found.
--- a/drivers/input/rmi4/Kconfig
+++ b/drivers/input/rmi4/Kconfig
@@ -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.