Merge remote-tracking branch 'tty/tty-next'

Conflicts:
	drivers/i2c/busses/Kconfig
	drivers/lguest/Kconfig
	drivers/net/can/Kconfig
	drivers/net/wan/Kconfig

diff --cc arch/alpha/Kconfig
Simple merge

diff --cc arch/mips/sni/a20r.c
Simple merge

diff --cc arch/parisc/Kconfig
Simple merge

diff --cc arch/tile/Kconfig
Simple merge

diff --cc arch/xtensa/Kconfig
Simple merge

diff --cc drivers/i2c/busses/Kconfig
index c4a848a1418850c0eaaebc70f57d5c448e77422a,cf474b2df4ae0941b67b26e046396a479be9b67d..a3725de923848baba3c55f3067588f42759b5227
--- 1/drivers/i2c/busses/Kconfig
--- 2/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@@ -826,6 -803,7 +826,7 @@@ config I2C_PARPORT_LIGH
  
  config I2C_TAOS_EVM
        tristate "TAOS evaluation module"
 -      depends on EXPERIMENTAL && TTY
++      depends on TTY
        select SERIO
        select SERIO_SERPORT
        default n

diff --cc drivers/input/serio/Kconfig
Simple merge

diff --cc drivers/isdn/gigaset/interface.c
Simple merge

diff --cc drivers/lguest/Kconfig
index 6cdcdb0d3d58119182bf77ca0106809fb81f72fd,f9c43145a611a6910b1fd67445c2d366645f966a..89875ea19ade465cf0f47573da5e9a054b21d683
--- 1/drivers/lguest/Kconfig
--- 2/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@@ -1,6 -1,6 +1,6 @@@
  config LGUEST
        tristate "Linux hypervisor example code"
-       depends on X86_32 && EVENTFD
 -      depends on X86_32 && EXPERIMENTAL && EVENTFD && TTY
++      depends on X86_32 && EVENTFD && TTY
        select HVC_DRIVER
        ---help---
          This is a very simple module which allows you to run

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/net/caif/Kconfig
Simple merge

diff --cc drivers/net/can/Kconfig
index 1cca19f1c490b5807f5862d6d75d90f7752b6c9e,72df3a306a08994b0a26242fdd8b5f49b1666a7e..9862b2e07644462b59fe81c137c7ad6d835bd2d8
--- 1/drivers/net/can/Kconfig
--- 2/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@@ -11,6 -13,7 +11,7 @@@ config CAN_VCA
  
  config CAN_SLCAN
        tristate "Serial / USB serial CAN Adaptors (slcan)"
 -      depends on CAN && TTY
++      depends on 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 --cc drivers/net/irda/Kconfig
Simple merge

diff --cc drivers/net/ppp/Kconfig
Simple merge

diff --cc drivers/net/usb/Kconfig
Simple merge

diff --cc drivers/net/usb/hso.c
Simple merge

diff --cc drivers/net/wan/Kconfig
index 13daec88d918ddd07ba7d317c2937db8cc87c63e,61eb8994b34f90fdce5fbf5b34894d2a158d1d4e..94e234975c6114d0e46fde4c71c34625596fe6f4
--- 1/drivers/net/wan/Kconfig
--- 2/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@@ -374,8 -428,8 +374,8 @@@ config LAPBETHE
          If unsure, say N.
  
  config X25_ASY
 -      tristate "X.25 async driver (EXPERIMENTAL)"
 +      tristate "X.25 async driver"
-       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 --cc drivers/s390/char/tty3270.c
Simple merge

diff --cc drivers/tty/serial/Kconfig
Simple merge

diff --cc drivers/tty/serial/max3100.c
Simple merge

diff --cc drivers/tty/serial/sccnxp.c
Simple merge

diff --cc drivers/tty/tty_io.c
Simple merge

diff --cc drivers/tty/vt/vt.c
Simple merge

diff --cc drivers/usb/serial/ftdi_sio.c
Simple merge

diff --cc include/linux/console.h
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge

diff --cc include/linux/proc_fs.h
Simple merge

diff --cc lib/Kconfig.kgdb
Simple merge

diff --cc sound/soc/codecs/Kconfig
index 133025fbb6d40e7ed3be462b1a7505975d978346,298822c0ad65d8b422b379769c2eb1d640a898f1..45b72561c61588f672b524471d9c5dd96cdeb73f
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -34,9 -34,8 +34,9 @@@ config SND_SOC_ALL_CODEC
        select SND_SOC_CS42L73 if I2C
        select SND_SOC_CS4270 if I2C
        select SND_SOC_CS4271 if SND_SOC_I2C_AND_SPI
-       select SND_SOC_CX20442
+       select SND_SOC_CX20442 if TTY
        select SND_SOC_DA7210 if I2C
 +      select SND_SOC_DA7213 if I2C
        select SND_SOC_DA732X if I2C
        select SND_SOC_DA9055 if I2C
        select SND_SOC_DFBMCS320