40 files changed, 107 insertions, 32 deletions

diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
index e9f203eadb1f..fdfd61a2d523 100644
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
@@ -26,6 +26,7 @@ config BT_HCIBTSDIO
 
 config BT_HCIUART
         tristate "HCI UART driver"
+        depends on TTY
         help
           Bluetooth HCI UART driver.
           This driver is required if you want to use Bluetooth devices with
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 72bedad6bf8c..3bb6fa3930be 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -53,7 +53,7 @@ source "drivers/tty/serial/Kconfig"
 
 config TTY_PRINTK
         bool "TTY driver to output user messages via printk"
-        depends on EXPERT
+        depends on EXPERT && TTY
         default n
         ---help---
           If you say Y here, the support for writing user messages (i.e.
@@ -159,7 +159,7 @@ source "drivers/tty/hvc/Kconfig"
 
 config VIRTIO_CONSOLE
         tristate "Virtio console"
-        depends on VIRTIO
+        depends on VIRTIO && TTY
         select HVC_DRIVER
         help
           Virtio console for use with lguest and other hypervisors.
@@ -392,6 +392,7 @@ config XILINX_HWICAP
 
 config R3964
         tristate "Siemens R3964 line discipline"
+        depends on TTY
         ---help---
           This driver allows synchronous communication with devices using the
           Siemens R3964 packet protocol. Unless you are dealing with special
@@ -439,7 +440,7 @@ source "drivers/char/pcmcia/Kconfig"
 
 config MWAVE
         tristate "ACP Modem (Mwave) support"
-        depends on X86
+        depends on X86 && TTY
         select SERIAL_8250
         ---help---
           The ACP modem (Mwave) for Linux is a WinModem. It is composed of a
diff --git a/drivers/char/pcmcia/Kconfig b/drivers/char/pcmcia/Kconfig
index 6614416a8623..2a166d56738a 100644
--- a/drivers/char/pcmcia/Kconfig
+++ b/drivers/char/pcmcia/Kconfig
@@ -7,7 +7,7 @@ menu "PCMCIA character devices"
 
 config SYNCLINK_CS
         tristate "SyncLink PC Card support"
-        depends on PCMCIA
+        depends on PCMCIA && TTY
         help
           Enable support for the SyncLink PC Card serial adapter, running
           asynchronous and HDLC communications up to 512Kbps. The port is
@@ -45,7 +45,7 @@ config CARDMAN_4040
 
 config IPWIRELESS
         tristate "IPWireless 3G UMTS PCMCIA card support"
-        depends on PCMCIA && NETDEVICES
+        depends on PCMCIA && NETDEVICES && TTY
         select PPP
         help
           This is a driver for 3G UMTS PCMCIA card from IPWireless company. In
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index bdca5111eb9d..cf474b2df4ae 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -803,7 +803,7 @@ config I2C_PARPORT_LIGHT
 
 config I2C_TAOS_EVM
         tristate "TAOS evaluation module"
-        depends on EXPERIMENTAL
+        depends on EXPERIMENTAL && TTY
         select SERIO
         select SERIO_SERPORT
         default n
diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index 56eb471b5576..055bcaba774c 100644
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -132,6 +132,8 @@ config JOYSTICK_TMDC
 
 source "drivers/input/joystick/iforce/Kconfig"
 
+if TTY
+
 config JOYSTICK_WARRIOR
         tristate "Logitech WingMan Warrior joystick"
         select SERIO
@@ -205,6 +207,8 @@ 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
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 5a240c60342d..008f96aaf19e 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -69,6 +69,7 @@ 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
@@ -153,6 +154,7 @@ 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
@@ -268,7 +270,7 @@ config KEYBOARD_HIL_OLD
 
 config KEYBOARD_HIL
         tristate "HP HIL keyboard/pointer support"
-        depends on GSC || HP300
+        depends on (GSC || HP300) && TTY
         default y
         select HP_SDC
         select HIL_MLC
@@ -400,6 +402,7 @@ 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.
@@ -479,6 +482,8 @@ 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
@@ -501,6 +506,8 @@ 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
@@ -597,6 +604,7 @@ 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
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index cd6268cf7cd5..fc160f72dc4e 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -14,6 +14,7 @@ if INPUT_MOUSE
 
 config MOUSE_PS2
         tristate "PS/2 mouse"
+        depends on TTY
         default y
         select SERIO
         select SERIO_LIBPS2
@@ -138,6 +139,7 @@ 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
@@ -262,6 +264,7 @@ 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
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 4a4e182c33e7..81ee7551148e 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -4,6 +4,7 @@
 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
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 515cfe790543..3d6f548dd3d4 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -192,6 +192,8 @@ 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
@@ -216,6 +218,8 @@ 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
@@ -237,6 +241,7 @@ 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
@@ -275,6 +280,8 @@ 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
@@ -311,6 +318,8 @@ 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
@@ -369,6 +378,8 @@ 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
@@ -393,6 +404,8 @@ 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
@@ -450,6 +463,7 @@ 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
@@ -493,6 +507,8 @@ 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
@@ -517,6 +533,8 @@ 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
@@ -790,6 +808,8 @@ 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
@@ -813,6 +833,8 @@ 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
diff --git a/drivers/ipack/devices/Kconfig b/drivers/ipack/devices/Kconfig
index 0b82fdc198c0..907a8cb48f2a 100644
--- a/drivers/ipack/devices/Kconfig
+++ b/drivers/ipack/devices/Kconfig
@@ -1,6 +1,6 @@
 config SERIAL_IPOCTAL
         tristate "IndustryPack IP-OCTAL uart support"
-        depends on IPACK_BUS
+        depends on IPACK_BUS && TTY
         help
           This driver supports the IPOCTAL serial port device for the IndustryPack bus.
         default n
diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig
index 86cd75a0e84d..ef661acdda17 100644
--- a/drivers/isdn/Kconfig
+++ b/drivers/isdn/Kconfig
@@ -22,6 +22,7 @@ if ISDN
 
 menuconfig ISDN_I4L
         tristate "Old ISDN4Linux (deprecated)"
+        depends on TTY
         ---help---
           This driver allows you to use an ISDN adapter for networking
           connections and as dialin/out device.  The isdn-tty's have a built
diff --git a/drivers/isdn/capi/Kconfig b/drivers/isdn/capi/Kconfig
index 15c3ffd9d860..f04686580040 100644
--- a/drivers/isdn/capi/Kconfig
+++ b/drivers/isdn/capi/Kconfig
@@ -18,6 +18,7 @@ config CAPI_TRACE
 
 config ISDN_CAPI_MIDDLEWARE
         bool "CAPI2.0 Middleware support"
+        depends on TTY
         help
           This option will enhance the capabilities of the /dev/capi20
           interface.  It will provide a means of moving a data connection,
diff --git a/drivers/isdn/gigaset/Kconfig b/drivers/isdn/gigaset/Kconfig
index b18a92c32184..dde5e09e6267 100644
--- a/drivers/isdn/gigaset/Kconfig
+++ b/drivers/isdn/gigaset/Kconfig
@@ -1,5 +1,6 @@
 menuconfig ISDN_DRV_GIGASET
         tristate "Siemens Gigaset support"
+        depends on TTY
         select CRC_CCITT
         select BITREVERSE
         help
diff --git a/drivers/isdn/hardware/mISDN/Kconfig b/drivers/isdn/hardware/mISDN/Kconfig
index eadc1cd34a20..b8611e3e5e74 100644
--- a/drivers/isdn/hardware/mISDN/Kconfig
+++ b/drivers/isdn/hardware/mISDN/Kconfig
@@ -76,6 +76,7 @@ config MISDN_NETJET
         tristate "Support for NETJet cards"
         depends on MISDN
         depends on PCI
+        depends on TTY
         select MISDN_IPAC
         select ISDN_HDLC
         select ISDN_I4L
diff --git a/drivers/lguest/Kconfig b/drivers/lguest/Kconfig
index 34ae49dc557c..f9c43145a611 100644
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@ -1,6 +1,6 @@
 config LGUEST
         tristate "Linux hypervisor example code"
-        depends on X86_32 && EXPERIMENTAL && EVENTFD
+        depends on X86_32 && EXPERIMENTAL && EVENTFD && TTY
         select HVC_DRIVER
         ---help---
           This is a very simple module which allows you to run
diff --git a/drivers/media/radio/wl128x/Kconfig b/drivers/media/radio/wl128x/Kconfig
index ea1e6545df36..f359be7e9dd9 100644
--- a/drivers/media/radio/wl128x/Kconfig
+++ b/drivers/media/radio/wl128x/Kconfig
@@ -4,7 +4,7 @@
 menu "Texas Instruments WL128x FM driver (ST based)"
 config RADIO_WL128X
         tristate "Texas Instruments WL128x FM Radio"
-        depends on VIDEO_V4L2 && RFKILL && GPIOLIB
+        depends on VIDEO_V4L2 && RFKILL && GPIOLIB && TTY
         select TI_ST if NET
         help
         Choose Y here if you have this FM radio chip.
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index b151b7c1bd59..4b2bb939dde1 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -127,7 +127,7 @@ config PHANTOM
 
 config INTEL_MID_PTI
         tristate "Parallel Trace Interface for MIPI P1149.7 cJTAG standard"
-        depends on PCI
+        depends on PCI && TTY
         default n
         help
           The PTI (Parallel Trace Interface) driver directs
diff --git a/drivers/misc/ti-st/Kconfig b/drivers/misc/ti-st/Kconfig
index abb5de1afce3..f34dcc514730 100644
--- a/drivers/misc/ti-st/Kconfig
+++ b/drivers/misc/ti-st/Kconfig
@@ -5,7 +5,7 @@
 menu "Texas Instruments shared transport line discipline"
 config TI_ST
         tristate "Shared transport core driver"
-        depends on NET && GPIOLIB
+        depends on NET && GPIOLIB && TTY
         select FW_LOADER
         help
           This enables the shared transport core driver for TI
diff --git a/drivers/mmc/card/Kconfig b/drivers/mmc/card/Kconfig
index 3b1f783bf924..5562308699bc 100644
--- a/drivers/mmc/card/Kconfig
+++ b/drivers/mmc/card/Kconfig
@@ -52,6 +52,7 @@ config MMC_BLOCK_BOUNCE
 
 config SDIO_UART
         tristate "SDIO UART/GPS class support"
+        depends on TTY
         help
           SDIO function driver for SDIO cards that implements the UART
           class, as well as the GPS class which appears like a UART.
diff --git a/drivers/net/caif/Kconfig b/drivers/net/caif/Kconfig
index abf4d7a9dcce..60c2142373c9 100644
--- a/drivers/net/caif/Kconfig
+++ b/drivers/net/caif/Kconfig
@@ -6,7 +6,7 @@ comment "CAIF transport drivers"
 
 config CAIF_TTY
         tristate "CAIF TTY transport driver"
-        depends on CAIF
+        depends on CAIF && TTY
         default n
         ---help---
         The CAIF TTY transport driver is a Line Discipline (ldisc)
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index b56bd9e80957..72df3a306a08 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -13,7 +13,7 @@ config CAN_VCAN
 
 config CAN_SLCAN
         tristate "Serial / USB serial CAN Adaptors (slcan)"
-        depends on CAN
+        depends on CAN && TTY
         ---help---
           CAN driver for several 'low cost' CAN interfaces that are attached
           via serial lines or via USB-to-serial adapters using the LAWICEL
diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig
index 95dbcfdf131d..bf5e59687680 100644
--- a/drivers/net/hamradio/Kconfig
+++ b/drivers/net/hamradio/Kconfig
@@ -1,6 +1,6 @@
 config MKISS
         tristate "Serial port KISS driver"
-        depends on AX25
+        depends on AX25 && TTY
         select CRC16
         ---help---
           KISS is a protocol used for the exchange of data between a computer
@@ -18,7 +18,7 @@ config MKISS
 
 config 6PACK
         tristate "Serial port 6PACK driver"
-        depends on AX25
+        depends on AX25 && TTY
         ---help---
           6pack is a transmission protocol for the data exchange between your
           PC and your TNC (the Terminal Node Controller acts as a kind of
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig
index 595205406d73..e1454cdec14b 100644
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@ -5,7 +5,7 @@ comment "SIR device drivers"
 
 config IRTTY_SIR
         tristate "IrTTY (uses Linux serial driver)"
-        depends on IRDA
+        depends on IRDA && TTY
         help
           Say Y here if you want to build support for the IrTTY line
           discipline.  To compile it as a module, choose M here: the module
diff --git a/drivers/net/ppp/Kconfig b/drivers/net/ppp/Kconfig
index 872df3ef07a6..3d9ef4f1e600 100644
--- a/drivers/net/ppp/Kconfig
+++ b/drivers/net/ppp/Kconfig
@@ -147,6 +147,7 @@ config PPPOL2TP
           Support for PPP-over-L2TP socket family. L2TP is a protocol
           used by ISPs and enterprises to tunnel PPP traffic over UDP
           tunnels. L2TP is replacing PPTP for VPN uses.
+if TTY
 
 config PPP_ASYNC
         tristate "PPP support for async serial ports"
@@ -172,4 +173,6 @@ config PPP_SYNC_TTY
 
           To compile this driver as a module, choose M here.
 
+endif # TTY
+
 endif # PPP
diff --git a/drivers/net/slip/Kconfig b/drivers/net/slip/Kconfig
index 211b160e4e9c..48e68714eef3 100644
--- a/drivers/net/slip/Kconfig
+++ b/drivers/net/slip/Kconfig
@@ -4,6 +4,7 @@
 
 config SLIP
         tristate "SLIP (serial line) support"
+        depends on TTY
         ---help---
           Say Y if you intend to use SLIP or CSLIP (compressed SLIP) to
           connect to your Internet service provider or to connect to some
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index ef976215b649..bd33153261ce 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -445,7 +445,7 @@ config USB_NET_QMI_WWAN
 
 config USB_HSO
         tristate "Option USB High Speed Mobile Devices"
-        depends on USB && RFKILL
+        depends on USB && RFKILL && TTY
         default n
         help
           Choose this option if you have an Option HSDPA/HSUPA card.
@@ -493,7 +493,7 @@ config USB_SIERRA_NET
 
 config USB_VL600
         tristate "LG VL600 modem dongle"
-        depends on USB_NET_CDCETHER
+        depends on USB_NET_CDCETHER && TTY
         select USB_ACM
         help
           Select this if you want to use an LG Electronics 4G/LTE usb modem
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index d58431e99f73..61eb8994b34f 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -429,7 +429,7 @@ config LAPBETHER
 
 config X25_ASY
         tristate "X.25 async driver (EXPERIMENTAL)"
-        depends on LAPB && X25
+        depends on LAPB && X25 && TTY
         ---help---
           Send and receive X.25 frames over regular asynchronous serial
           lines such as telephone lines equipped with ordinary modems.
diff --git a/drivers/pps/clients/Kconfig b/drivers/pps/clients/Kconfig
index 445197d4a8c4..6efd9b60d8ff 100644
--- a/drivers/pps/clients/Kconfig
+++ b/drivers/pps/clients/Kconfig
@@ -17,7 +17,7 @@ config PPS_CLIENT_KTIMER
 
 config PPS_CLIENT_LDISC
         tristate "PPS line discipline"
-        depends on PPS
+        depends on PPS && TTY
         help
           If you say yes here you get support for a PPS source connected
           with the CD (Carrier Detect) pin of your serial port.
diff --git a/drivers/s390/char/Kconfig b/drivers/s390/char/Kconfig
index 2c9a776bd63c..71bf959732fe 100644
--- a/drivers/s390/char/Kconfig
+++ b/drivers/s390/char/Kconfig
@@ -11,7 +11,7 @@ config TN3270
 config TN3270_TTY
         def_tristate y
         prompt "Support for tty input/output on 3270 terminals"
-        depends on TN3270
+        depends on TN3270 && TTY
         help
           Include support for using an IBM 3270 terminal as a Linux tty.
 
@@ -33,7 +33,7 @@ config TN3270_CONSOLE
 config TN3215
         def_bool y
         prompt "Support for 3215 line mode terminal"
-        depends on CCW
+        depends on CCW && TTY
         help
           Include support for IBM 3215 line-mode terminals.
 
@@ -51,7 +51,7 @@ config CCW_CONSOLE
 config SCLP_TTY
         def_bool y
         prompt "Support for SCLP line mode terminal"
-        depends on S390
+        depends on S390 && TTY
         help
           Include support for IBM SCLP line-mode terminals.
 
@@ -66,7 +66,7 @@ config SCLP_CONSOLE
 config SCLP_VT220_TTY
         def_bool y
         prompt "Support for SCLP VT220-compatible terminal"
-        depends on S390
+        depends on S390 && TTY
         help
           Include support for an IBM SCLP VT220-compatible terminal.
 
diff --git a/drivers/staging/ccg/Kconfig b/drivers/staging/ccg/Kconfig
index 8997a8c757aa..7ed5bc6caadb 100644
--- a/drivers/staging/ccg/Kconfig
+++ b/drivers/staging/ccg/Kconfig
@@ -2,7 +2,7 @@ if USB_GADGET
 
 config USB_G_CCG
         tristate "Configurable Composite Gadget (STAGING)"
-        depends on STAGING && BLOCK && NET && !USB_ZERO && !USB_ZERO_HNPTEST && !USB_AUDIO && !GADGET_UAC1 && !USB_ETH && !USB_ETH_RNDIS && !USB_ETH_EEM && !USB_G_NCM && !USB_GADGETFS && !USB_FUNCTIONFS && !USB_FUNCTIONFS_ETH && !USB_FUNCTIONFS_RNDIS && !USB_FUNCTIONFS_GENERIC && !USB_FILE_STORAGE && !USB_FILE_STORAGE_TEST && !USB_MASS_STORAGE && !USB_G_SERIAL && !USB_MIDI_GADGET && !USB_G_PRINTER && !USB_CDC_COMPOSITE && !USB_G_NOKIA && !USB_G_ACM_MS && !USB_G_MULTI && !USB_G_MULTI_RNDIS && !USB_G_MULTI_CDC && !USB_G_HID && !USB_G_DBGP && !USB_G_WEBCAM
+        depends on STAGING && BLOCK && NET && !USB_ZERO && !USB_ZERO_HNPTEST && !USB_AUDIO && !GADGET_UAC1 && !USB_ETH && !USB_ETH_RNDIS && !USB_ETH_EEM && !USB_G_NCM && !USB_GADGETFS && !USB_FUNCTIONFS && !USB_FUNCTIONFS_ETH && !USB_FUNCTIONFS_RNDIS && !USB_FUNCTIONFS_GENERIC && !USB_FILE_STORAGE && !USB_FILE_STORAGE_TEST && !USB_MASS_STORAGE && !USB_G_SERIAL && !USB_MIDI_GADGET && !USB_G_PRINTER && !USB_CDC_COMPOSITE && !USB_G_NOKIA && !USB_G_ACM_MS && !USB_G_MULTI && !USB_G_MULTI_RNDIS && !USB_G_MULTI_CDC && !USB_G_HID && !USB_G_DBGP && !USB_G_WEBCAM && TTY
         help
           The Configurable Composite Gadget supports multiple USB
           functions: acm, mass storage, rndis and FunctionFS.
diff --git a/drivers/staging/dgrp/Kconfig b/drivers/staging/dgrp/Kconfig
index 39f4bb65ec83..e4c41552923a 100644
--- a/drivers/staging/dgrp/Kconfig
+++ b/drivers/staging/dgrp/Kconfig
@@ -1,7 +1,7 @@
 config DGRP
        tristate "Digi Realport driver"
        default n
-       depends on SYSFS
+       depends on SYSFS && TTY
        ---help---
        Support for Digi Realport devices.  These devices allow you to
        access remote serial ports as if they are local tty devices.  This
diff --git a/drivers/staging/fwserial/Kconfig b/drivers/staging/fwserial/Kconfig
index 580406cb1808..9cdb3cdc4b66 100644
--- a/drivers/staging/fwserial/Kconfig
+++ b/drivers/staging/fwserial/Kconfig
@@ -1,6 +1,6 @@
 config FIREWIRE_SERIAL
        tristate "TTY over Firewire"
-       depends on FIREWIRE
+       depends on FIREWIRE && TTY
        help
           This enables TTY over IEEE 1394, providing high-speed serial
           connectivity to cabled peers.
diff --git a/drivers/staging/sb105x/Kconfig b/drivers/staging/sb105x/Kconfig
index 3d0d0eb95b8c..6a2e1b78e844 100644
--- a/drivers/staging/sb105x/Kconfig
+++ b/drivers/staging/sb105x/Kconfig
@@ -1,7 +1,7 @@
 config SB105X
         tristate "SystemBase PCI Multiport UART"
         select SERIAL_CORE
-        depends on PCI && BROKEN
+        depends on PCI && TTY && BROKEN
         help
           A driver for the SystemBase Multi-2/PCI serial card
 
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index 0ecf22b6a38e..a79fd8ebd56e 100644
--- a/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@ -1,3 +1,14 @@
+config TTY
+        bool "Enable TTY" if EXPERT
+        default y
+        ---help---
+          Allows you to remove TTY support which can save space, and
+          blocks features that require TTY from inclusion in the kernel.
+          TTY is required for any text terminals or serial port
+          communication. Most users should leave this enabled.
+
+if TTY
+
 config VT
         bool "Virtual terminal" if EXPERT
         depends on !S390 && !UML
@@ -388,3 +399,5 @@ config PPC_EARLY_DEBUG_EHV_BC_HANDLE
           If the number you specify is not a valid byte channel handle, then
           there simply will be no early console output.  This is true also
           if you don't boot under a hypervisor at all.
+
+endif # TTY
diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile
index 2953059530e4..df5663d0d55e 100644
--- a/drivers/tty/Makefile
+++ b/drivers/tty/Makefile
@@ -1,4 +1,4 @@
-obj-y                           += tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o \
+obj-$(CONFIG_TTY)               += tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o \
                                    tty_buffer.o tty_port.o tty_mutex.o
 obj-$(CONFIG_LEGACY_PTYS)       += pty.o
 obj-$(CONFIG_UNIX98_PTYS)       += pty.o
diff --git a/drivers/tty/hvc/Kconfig b/drivers/tty/hvc/Kconfig
index f47b734c6a7a..8902f9b4df71 100644
--- a/drivers/tty/hvc/Kconfig
+++ b/drivers/tty/hvc/Kconfig
@@ -1,3 +1,5 @@
+if TTY
+
 config HVC_DRIVER
         bool
         help
@@ -119,3 +121,4 @@ config HVCS
           which will also be compiled when this driver is built as a
           module.
 
+endif # TTY
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 2dc429357fe3..e9aeccdfbe35 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -2,6 +2,8 @@
 # Serial device configuration
 #
 
+if TTY
+
 menu "Serial drivers"
         depends on HAS_IOMEM
 
@@ -1483,3 +1485,5 @@ config SERIAL_RP2_NR_UARTS
           need to be increased.
 
 endmenu
+
+endif # TTY
diff --git a/drivers/usb/class/Kconfig b/drivers/usb/class/Kconfig
index 2519e320098f..316aac8e4ca1 100644
--- a/drivers/usb/class/Kconfig
+++ b/drivers/usb/class/Kconfig
@@ -6,7 +6,7 @@ comment "USB Device Class drivers"
 
 config USB_ACM
         tristate "USB Modem (CDC ACM) support"
-        depends on USB
+        depends on USB && TTY
         ---help---
           This driver supports USB modems and ISDN adapters which support the
           Communication Device Class Abstract Control Model interface.
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 14625fd2cecd..a1bd951f9cb7 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -750,6 +750,7 @@ config USB_GADGET_TARGET
 
 config USB_G_SERIAL
         tristate "Serial Gadget (with CDC ACM and CDC OBEX support)"
+        depends on TTY
         select USB_LIBCOMPOSITE
         help
           The Serial Gadget talks to the Linux-USB generic serial driver.
@@ -799,6 +800,8 @@ config USB_G_PRINTER
           For more information, see Documentation/usb/gadget_printer.txt
           which includes sample code for accessing the device file.
 
+if TTY
+
 config USB_CDC_COMPOSITE
         tristate "CDC Composite Device (Ethernet and ACM)"
         depends on NET
@@ -879,6 +882,8 @@ config USB_G_MULTI_CDC
 
           If unsure, say "y".
 
+endif # TTY
+
 config USB_G_HID
         tristate "HID Gadget"
         select USB_LIBCOMPOSITE
@@ -895,6 +900,7 @@ config USB_G_HID
 # Standalone / single function gadgets
 config USB_G_DBGP
         tristate "EHCI Debug Device Gadget"
+        depends on TTY
         select USB_LIBCOMPOSITE
         help
           This gadget emulates an EHCI Debug device. This is useful when you want
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 76f462241738..d8e35fe30b0c 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -4,7 +4,7 @@
 
 menuconfig USB_SERIAL
         tristate "USB Serial Converter support"
-        depends on USB
+        depends on USB && TTY
         ---help---
           Say Y here if you have a USB device that provides normal serial
           ports, or acts like a serial device, and you want to connect it to