diff options
| author | Dmitry Torokhov | 2020-07-21 22:17:27 -0700 |
|---|---|---|
| committer | Dmitry Torokhov | 2020-07-21 22:17:27 -0700 |
| commit | a5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e (patch) | |
| tree | 7f46722dcd4bdce411612d9ccb83651795dad5e3 /drivers/input/joystick | |
| parent | 9b031c86506cef9acae45e61339fcf9deaabb793 (diff) | |
| parent | a50ca29523b18baea548bdf5df9b4b923c2bb4f6 (diff) | |
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/Kconfig | 1 |
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. |