Skip to content

Commit 413d373

Browse files
arndbdtor
authored andcommitted
Input: synaptics-rmi4 - select 'SERIO' when needed
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]>
1 parent 601bbbe commit 413d373

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

drivers/input/rmi4/Kconfig

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,19 @@ config RMI4_SMB
4242
config RMI4_F03
4343
bool "RMI4 Function 03 (PS2 Guest)"
4444
depends on RMI4_CORE
45-
depends on SERIO=y || RMI4_CORE=SERIO
4645
help
4746
Say Y here if you want to add support for RMI4 function 03.
4847

4948
Function 03 provides PS2 guest support for RMI4 devices. This
5049
includes support for TrackPoints on TouchPads.
5150

51+
config RMI4_F03_SERIO
52+
tristate
53+
depends on RMI4_CORE
54+
depends on RMI4_F03
55+
default RMI4_CORE
56+
select SERIO
57+
5258
config RMI4_2D_SENSOR
5359
bool
5460
depends on RMI4_CORE

0 commit comments

Comments
 (0)