diff options
author | Dave Airlie <airlied@redhat.com> | 2017-02-23 03:10:12 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-02-23 03:10:12 +0100 |
commit | 94000cc32988a0674923309d35ab9c2405c4b39b (patch) | |
tree | ef9d58ea9ad614bfdf6d0c7c6293f05dbd989475 /drivers/input/rmi4/Kconfig | |
parent | Merge tag 'drm-tinydrm-2017-02-18' of https://github.com/notro/linux into drm... (diff) | |
parent | Linux 4.10-rc8 (diff) | |
download | linux-94000cc32988a0674923309d35ab9c2405c4b39b.tar.xz linux-94000cc32988a0674923309d35ab9c2405c4b39b.zip |
Merge tag 'v4.10-rc8' into drm-next
Linux 4.10-rc8
Backmerge Linus rc8 to fix some conflicts, but also
to avoid pulling it in via a fixes pull from someone.
Diffstat (limited to 'drivers/input/rmi4/Kconfig')
-rw-r--r-- | drivers/input/rmi4/Kconfig | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/input/rmi4/Kconfig b/drivers/input/rmi4/Kconfig index 8993983e3fe4..bb7762bf2879 100644 --- a/drivers/input/rmi4/Kconfig +++ b/drivers/input/rmi4/Kconfig @@ -42,13 +42,19 @@ config RMI4_SMB config RMI4_F03 bool "RMI4 Function 03 (PS2 Guest)" 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. Function 03 provides PS2 guest support for RMI4 devices. This includes support for TrackPoints on TouchPads. +config RMI4_F03_SERIO + tristate + depends on RMI4_CORE + depends on RMI4_F03 + default RMI4_CORE + select SERIO + config RMI4_2D_SENSOR bool depends on RMI4_CORE |