Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 413d3732 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Dmitry Torokhov
Browse files

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: d7ddad0a ("Input: synaptics-rmi4 - fix F03 build error when serio is module")
Fixes: c5e8848f ("Input: synaptics-rmi4 - add support for F03")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 601bbbe0
Loading
Loading
Loading
Loading
+7 −1
Original line number Original line Diff line number Diff line
@@ -42,13 +42,19 @@ config RMI4_SMB
config RMI4_F03
config RMI4_F03
        bool "RMI4 Function 03 (PS2 Guest)"
        bool "RMI4 Function 03 (PS2 Guest)"
	depends on RMI4_CORE
	depends on RMI4_CORE
	depends on SERIO=y || RMI4_CORE=SERIO
        help
        help
          Say Y here if you want to add support for RMI4 function 03.
          Say Y here if you want to add support for RMI4 function 03.


          Function 03 provides PS2 guest support for RMI4 devices. This
          Function 03 provides PS2 guest support for RMI4 devices. This
          includes support for TrackPoints on TouchPads.
          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
config RMI4_2D_SENSOR
	bool
	bool
	depends on RMI4_CORE
	depends on RMI4_CORE