diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-10-12 21:31:40 +0200 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2016-10-12 22:59:33 +0200 |
commit | ea893695ec1131a5fed0523ff8094bc6e8723bbe (patch) | |
tree | ce18c74e1344b902c8ee276d8f75b3cab83eb617 | |
parent | 40c30bbf3377babc4d6bb16b699184236a8bfa27 (diff) | |
download | linux-stable-ea893695ec1131a5fed0523ff8094bc6e8723bbe.tar.gz linux-stable-ea893695ec1131a5fed0523ff8094bc6e8723bbe.tar.bz2 linux-stable-ea893695ec1131a5fed0523ff8094bc6e8723bbe.zip |
platform/x86: asus-wmi: add SERIO_I8042 dependency
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>
-rw-r--r-- | drivers/platform/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 81b8dcca8891..b8a21d7b25d4 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -576,6 +576,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... |