summaryrefslogtreecommitdiff
path: root/drivers/input/joystick
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2020-07-22 08:17:27 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2020-07-22 08:17:27 +0300
commita5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e (patch)
tree7f46722dcd4bdce411612d9ccb83651795dad5e3 /drivers/input/joystick
parent9b031c86506cef9acae45e61339fcf9deaabb793 (diff)
parenta50ca29523b18baea548bdf5df9b4b923c2bb4f6 (diff)
downloadlinux-a5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e.tar.xz
Merge branch 'for-linus' into next
Sync up with 'for-linus' branch to resolve conflict in Elan touchpad driver.
Diffstat (limited to 'drivers/input/joystick')
-rw-r--r--drivers/input/joystick/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index 940b744639c7..6f73f02059b5 100644
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -45,6 +45,7 @@ config JOYSTICK_A3D
config JOYSTICK_ADI
tristate "Logitech ADI digital joysticks and gamepads"
select GAMEPORT
+ depends on ADI!=m # avoid module name conflict
help
Say Y here if you have a Logitech controller using the ADI
protocol over the PC gameport.