diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-12-29 19:08:49 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-12-29 19:08:49 +0100 |
| commit | 72f0991354b24b9860ddc57b12d5c39bd8e3c962 (patch) | |
| tree | f91da47db566f66aa57dbcf4adee5d6b213c2e2a /drivers/input | |
| parent | Input: xpad - use correct product id for x360w controllers (diff) | |
| parent | Input: synaptics-rmi4 - fix F03 build error when serio is module (diff) | |
| download | linux-72f0991354b24b9860ddc57b12d5c39bd8e3c962.tar.xz linux-72f0991354b24b9860ddc57b12d5c39bd8e3c962.zip | |
Merge branch 'synaptics-rmi4' into for-linus
This brings in fix for F03 build error when serio is module.
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/rmi4/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/rmi4/Kconfig b/drivers/input/rmi4/Kconfig index 30cc627a4f45..8993983e3fe4 100644 --- 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. |