Merge branch 'drm-tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into...

[firefly-linux-kernel-4.4.55.git] / drivers / input / joystick / Kconfig

diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index 055bcaba774c971d5f1d5473d43b342383925acd..56eb471b5576954f6119664b23a1d7b83316d3fb 100644 (file)
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -132,8 +132,6 @@ config JOYSTICK_TMDC
 
 source "drivers/input/joystick/iforce/Kconfig"
 
-if TTY
-
 config JOYSTICK_WARRIOR
        tristate "Logitech WingMan Warrior joystick"
        select SERIO
@@ -207,8 +205,6 @@ config JOYSTICK_ZHENHUA
          To compile this driver as a module, choose M here: the
          module will be called zhenhua.
 
-endif # TTY
-
 config JOYSTICK_DB9
        tristate "Multisystem, Sega Genesis, Saturn joysticks and gamepads"
        depends on PARPORT