summaryrefslogtreecommitdiff
path: root/drivers/input/mouse/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-05-12 22:00:15 +0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-05-12 23:33:52 +0400
commit0a4ac2ea2714b5e43293f752737b8c2731a26679 (patch)
treede0027b93a6f6bf7d30f3d81bc0e53884bc19a91 /drivers/input/mouse/Kconfig
parent36189cc3cd57ab0f1cd75241f93fe01de928ac06 (diff)
downloadlinux-0a4ac2ea2714b5e43293f752737b8c2731a26679.tar.xz
Input: fix ps2/serio module dependency
The ps2 mouse and keyboard drivers use the "serio" framework that they correctly select in Kconfig, and that in turn depends on the i8042 driver, which is also allowed to be disabled for architectures that don't have an i8042. However, Kconfig also allows i8042 to be built as a module while the serio framework is built-in, which causes this link error: drivers/built-in.o: In function `ps2_begin_command': :(.text+0x26b6cc): undefined reference to `i8042_check_port_owner' :(.text+0x26b6d4): undefined reference to `i8042_lock_chip' drivers/built-in.o: In function `ps2_end_command': :(.text+0x26b734): undefined reference to `i8042_check_port_owner' :(.text+0x26b73c): undefined reference to `i8042_unlock_chip' On x86, a specific 'select SERIO_I8042' takes care of it, but not on the other architecture that potentially have a i8042. This patch changes the Kconfig logic to ensure that whenever there is an i8042, it does get used for the serio driver, avoiding the link error above. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/mouse/Kconfig')
-rw-r--r--drivers/input/mouse/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index effa9c5f2c5c..6b8441f7bc32 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -17,7 +17,7 @@ config MOUSE_PS2
default y
select SERIO
select SERIO_LIBPS2
- select SERIO_I8042 if X86
+ select SERIO_I8042 if ARCH_MIGHT_HAVE_PC_SERIO
select SERIO_GSCPS2 if GSC
help
Say Y here if you have a PS/2 mouse connected to your system. This