Skip to content

Commit

Permalink
Input: synaptics-rmi4 - select 'SERIO' when needed
Browse files Browse the repository at this point in the history
With CONFIG_SERIO=m, we get a build error for the rmi4-f03 driver,
added in linux-4.10:

warning: (HID_RMI) selects RMI4_F03 which has unmet direct dependencies (!UML && INPUT && RMI4_CORE && (SERIO=y || RMI4_CORE=SERIO))
drivers/input/built-in.o: In function `rmi_f03_attention':
rmi_f03.c:(.text+0xcfe0): undefined reference to `serio_interrupt'
rmi_f03.c:(.text+0xd055): undefined reference to `serio_interrupt'
drivers/input/built-in.o: In function `rmi_f03_remove':
rmi_f03.c:(.text+0xd115): undefined reference to `serio_unregister_port'
drivers/input/built-in.o: In function `rmi_f03_probe':
rmi_f03.c:(.text+0xd209): undefined reference to `__serio_register_port'

An earlier patch tried to fix this, but missed the HID_RMI driver that
does a 'select' on the F03 backend.

This adds a hidden Kconfig symbol that enforces 'serio' to be enabled
when RMI4-F03 is, which covers all cases.

Fixes: d7ddad0 ("Input: synaptics-rmi4 - fix F03 build error when serio is module")
Fixes: c5e8848 ("Input: synaptics-rmi4 - add support for F03")
Signed-off-by: Arnd Bergmann <[email protected]>
Signed-off-by: Dmitry Torokhov <[email protected]>
  • Loading branch information
arndb authored and dtor committed Feb 7, 2017
1 parent 601bbbe commit 413d373
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion drivers/input/rmi4/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 413d373

Please sign in to comment.