Merge tag 'v5.2' into next

[sfrench/cifs-2.6.git] / drivers / input / joystick / iforce / Kconfig

diff --git a/drivers/input/joystick/iforce/Kconfig b/drivers/input/joystick/iforce/Kconfig
index 62dcc5b71641cbf2db89a8a6392c2fd6f5a582ac..f002fb88f2e75e96616d9e8fb648215c970eec18 100644 (file)
--- a/drivers/input/joystick/iforce/Kconfig
+++ b/drivers/input/joystick/iforce/Kconfig
@@ -14,15 +14,15 @@ config JOYSTICK_IFORCE
          module will be called iforce.
 
 config JOYSTICK_IFORCE_USB
-       bool "I-Force USB joysticks and wheels"
-       depends on JOYSTICK_IFORCE && (JOYSTICK_IFORCE=m || USB=y) && USB
+       tristate "I-Force USB joysticks and wheels"
+       depends on JOYSTICK_IFORCE && USB
        help
          Say Y here if you have an I-Force joystick or steering wheel
          connected to your USB port.
 
 config JOYSTICK_IFORCE_232
-       bool "I-Force Serial joysticks and wheels"
-       depends on JOYSTICK_IFORCE && (JOYSTICK_IFORCE=m || SERIO=y) && SERIO
+       tristate "I-Force Serial joysticks and wheels"
+       depends on JOYSTICK_IFORCE && SERIO
        help
          Say Y here if you have an I-Force joystick or steering wheel
          connected to your serial (COM) port.