[4.4,019/132] platform/x86: asus-wmi: add SERIO_I8042 dependency

Message ID 20191127202916.307387184@linuxfoundation.org
State New
Headers show
Series
  • Untitled series #25268
Related show

Commit Message

Greg KH Nov. 27, 2019, 8:30 p.m.
From: Arnd Bergmann <arnd@arndb.de>


[ Upstream commit ea893695ec1131a5fed0523ff8094bc6e8723bbe ]

A recent bugfix added a call to i8042_install_filter but did
not add the dependency, leading to possible link errors:

drivers/platform/built-in.o: In function `asus_nb_wmi_quirks':
asus-nb-wmi.c:(.text+0x23af): undefined reference to `i8042_install_filter'

This adds a dependency on SERIO_I8042||SERIO_I8042=n to indicate
that we can build the driver when the i8042 driver is disabled,
but it cannot be built-in when that is a loadable module.

Fixes: b5643539b825 ("platform/x86: asus-wmi: Filter buggy scan codes on ASUS Q500A")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Signed-off-by: Darren Hart <dvhart@linux.intel.com>

Signed-off-by: Sasha Levin <sashal@kernel.org>

---
 drivers/platform/x86/Kconfig | 1 +
 1 file changed, 1 insertion(+)

-- 
2.20.1

Patch

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 953974b5a9a95..6487453c68b59 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -566,6 +566,7 @@  config ASUS_WMI
 config ASUS_NB_WMI
 	tristate "Asus Notebook WMI Driver"
 	depends on ASUS_WMI
+	depends on SERIO_I8042 || SERIO_I8042 = n
 	---help---
 	  This is a driver for newer Asus notebooks. It adds extra features
 	  like wireless radio and bluetooth control, leds, hotkeys, backlight...