input: drop unnecessary dependencies on TTY
Backing out changes made in earlier TTY removal patch. Switched to only one dependency in SERPORT on TTY instead of many incorrect dependencies. Signed-off-by: Joe Millenbach <jmillenbach@gmail.com> Reported-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Joe Millenbach
Greg Kroah-Hartman
Родитель
a8cd98586b
Коммит
238d9f6e55
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -69,7 +69,6 @@ config KEYBOARD_ATARI
|
|||
config KEYBOARD_ATKBD
|
||||
tristate "AT keyboard" if EXPERT || !X86
|
||||
default y
|
||||
depends on TTY
|
||||
select SERIO
|
||||
select SERIO_LIBPS2
|
||||
select SERIO_I8042 if X86
|
||||
|
|
@ -154,7 +153,6 @@ config KEYBOARD_BFIN
|
|||
|
||||
config KEYBOARD_LKKBD
|
||||
tristate "DECstation/VAXstation LK201/LK401 keyboard"
|
||||
depends on TTY
|
||||
select SERIO
|
||||
help
|
||||
Say Y here if you want to use a LK201 or LK401 style serial
|
||||
|
|
@ -270,7 +268,7 @@ config KEYBOARD_HIL_OLD
|
|||
|
||||
config KEYBOARD_HIL
|
||||
tristate "HP HIL keyboard/pointer support"
|
||||
depends on (GSC || HP300) && TTY
|
||||
depends on GSC || HP300
|
||||
default y
|
||||
select HP_SDC
|
||||
select HIL_MLC
|
||||
|
|
@ -402,7 +400,6 @@ config KEYBOARD_IMX
|
|||
|
||||
config KEYBOARD_NEWTON
|
||||
tristate "Newton keyboard"
|
||||
depends on TTY
|
||||
select SERIO
|
||||
help
|
||||
Say Y here if you have a Newton keyboard on a serial port.
|
||||
|
|
@ -482,8 +479,6 @@ config KEYBOARD_SAMSUNG
|
|||
To compile this driver as a module, choose M here: the
|
||||
module will be called samsung-keypad.
|
||||
|
||||
if TTY
|
||||
|
||||
config KEYBOARD_STOWAWAY
|
||||
tristate "Stowaway keyboard"
|
||||
select SERIO
|
||||
|
|
@ -506,8 +501,6 @@ config KEYBOARD_SUNKBD
|
|||
To compile this driver as a module, choose M here: the
|
||||
module will be called sunkbd.
|
||||
|
||||
endif # TTY
|
||||
|
||||
config KEYBOARD_SH_KEYSC
|
||||
tristate "SuperH KEYSC keypad support"
|
||||
depends on SUPERH || ARCH_SHMOBILE
|
||||
|
|
@ -604,7 +597,6 @@ config KEYBOARD_TWL4030
|
|||
|
||||
config KEYBOARD_XTKBD
|
||||
tristate "XT keyboard"
|
||||
depends on TTY
|
||||
select SERIO
|
||||
help
|
||||
Say Y here if you want to use the old IBM PC/XT keyboard (or
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ if INPUT_MOUSE
|
|||
|
||||
config MOUSE_PS2
|
||||
tristate "PS/2 mouse"
|
||||
depends on TTY
|
||||
default y
|
||||
select SERIO
|
||||
select SERIO_LIBPS2
|
||||
|
|
@ -139,7 +138,6 @@ config MOUSE_PS2_OLPC
|
|||
|
||||
config MOUSE_SERIAL
|
||||
tristate "Serial mouse"
|
||||
depends on TTY
|
||||
select SERIO
|
||||
help
|
||||
Say Y here if you have a serial (RS-232, COM port) mouse connected
|
||||
|
|
@ -264,7 +262,6 @@ config MOUSE_RISCPC
|
|||
|
||||
config MOUSE_VSXXXAA
|
||||
tristate "DEC VSXXX-AA/GA mouse and VSXXX-AB tablet"
|
||||
depends on TTY
|
||||
select SERIO
|
||||
help
|
||||
Say Y (or M) if you want to use a DEC VSXXX-AA (hockey
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
config SERIO
|
||||
tristate "Serial I/O support" if EXPERT || !X86
|
||||
default y
|
||||
depends on TTY
|
||||
help
|
||||
Say Yes here if you have any input device that uses serial I/O to
|
||||
communicate with the system. This includes the
|
||||
|
|
@ -37,6 +36,7 @@ config SERIO_I8042
|
|||
config SERIO_SERPORT
|
||||
tristate "Serial port line discipline"
|
||||
default y
|
||||
depends on TTY
|
||||
help
|
||||
Say Y here if you plan to use an input device (mouse, joystick,
|
||||
tablet, 6dof) that communicates over the RS232 serial (COM) port.
|
||||
|
|
|
|||
|
|
@ -192,8 +192,6 @@ config TOUCHSCREEN_DA9052
|
|||
To compile this driver as a module, choose M here: the
|
||||
module will be called da9052_tsi.
|
||||
|
||||
if TTY
|
||||
|
||||
config TOUCHSCREEN_DYNAPRO
|
||||
tristate "Dynapro serial touchscreen"
|
||||
select SERIO
|
||||
|
|
@ -218,8 +216,6 @@ config TOUCHSCREEN_HAMPSHIRE
|
|||
To compile this driver as a module, choose M here: the
|
||||
module will be called hampshire.
|
||||
|
||||
endif # TTY
|
||||
|
||||
config TOUCHSCREEN_EETI
|
||||
tristate "EETI touchscreen panel support"
|
||||
depends on I2C
|
||||
|
|
@ -241,7 +237,6 @@ config TOUCHSCREEN_EGALAX
|
|||
|
||||
config TOUCHSCREEN_FUJITSU
|
||||
tristate "Fujitsu serial touchscreen"
|
||||
depends on TTY
|
||||
select SERIO
|
||||
help
|
||||
Say Y here if you have the Fujitsu touchscreen (such as one
|
||||
|
|
@ -280,8 +275,6 @@ config TOUCHSCREEN_S3C2410
|
|||
To compile this driver as a module, choose M here: the
|
||||
module will be called s3c2410_ts.
|
||||
|
||||
if TTY
|
||||
|
||||
config TOUCHSCREEN_GUNZE
|
||||
tristate "Gunze AHL-51S touchscreen"
|
||||
select SERIO
|
||||
|
|
@ -318,8 +311,6 @@ config TOUCHSCREEN_WACOM_W8001
|
|||
To compile this driver as a module, choose M here: the
|
||||
module will be called wacom_w8001.
|
||||
|
||||
endif # TTY
|
||||
|
||||
config TOUCHSCREEN_WACOM_I2C
|
||||
tristate "Wacom Tablet support (I2C)"
|
||||
depends on I2C
|
||||
|
|
@ -378,8 +369,6 @@ config TOUCHSCREEN_MMS114
|
|||
To compile this driver as a module, choose M here: the
|
||||
module will be called mms114.
|
||||
|
||||
if TTY
|
||||
|
||||
config TOUCHSCREEN_MTOUCH
|
||||
tristate "MicroTouch serial touchscreens"
|
||||
select SERIO
|
||||
|
|
@ -404,8 +393,6 @@ config TOUCHSCREEN_INEXIO
|
|||
To compile this driver as a module, choose M here: the
|
||||
module will be called inexio.
|
||||
|
||||
endif # TTY
|
||||
|
||||
config TOUCHSCREEN_INTEL_MID
|
||||
tristate "Intel MID platform resistive touchscreen"
|
||||
depends on INTEL_SCU_IPC
|
||||
|
|
@ -463,7 +450,6 @@ config TOUCHSCREEN_HTCPEN
|
|||
|
||||
config TOUCHSCREEN_PENMOUNT
|
||||
tristate "Penmount serial touchscreen"
|
||||
depends on TTY
|
||||
select SERIO
|
||||
help
|
||||
Say Y here if you have a Penmount serial touchscreen connected to
|
||||
|
|
@ -507,8 +493,6 @@ config TOUCHSCREEN_TNETV107X
|
|||
To compile this driver as a module, choose M here: the
|
||||
module will be called tnetv107x-ts.
|
||||
|
||||
if TTY
|
||||
|
||||
config TOUCHSCREEN_TOUCHRIGHT
|
||||
tristate "Touchright serial touchscreen"
|
||||
select SERIO
|
||||
|
|
@ -533,8 +517,6 @@ config TOUCHSCREEN_TOUCHWIN
|
|||
To compile this driver as a module, choose M here: the
|
||||
module will be called touchwin.
|
||||
|
||||
endif # TTY
|
||||
|
||||
config TOUCHSCREEN_TI_AM335X_TSC
|
||||
tristate "TI Touchscreen Interface"
|
||||
depends on MFD_TI_AM335X_TSCADC
|
||||
|
|
@ -808,8 +790,6 @@ config TOUCHSCREEN_USB_EASYTOUCH
|
|||
Say Y here if you have an EasyTouch USB Touch controller.
|
||||
If unsure, say N.
|
||||
|
||||
if TTY
|
||||
|
||||
config TOUCHSCREEN_TOUCHIT213
|
||||
tristate "Sahara TouchIT-213 touchscreen"
|
||||
select SERIO
|
||||
|
|
@ -833,8 +813,6 @@ config TOUCHSCREEN_TSC_SERIO
|
|||
To compile this driver as a module, choose M here: the
|
||||
module will be called tsc40.
|
||||
|
||||
endif # TTY
|
||||
|
||||
config TOUCHSCREEN_TSC2005
|
||||
tristate "TSC2005 based touchscreens"
|
||||
depends on SPI_MASTER && GENERIC_HARDIRQS
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче