From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Feb 2013 04:32:35 +0000 (+1100)
Subject: Merge remote-tracking branch 'tty/tty-next'
X-Git-Tag: next-20130220~28
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=45b3160df7493d62108fc135a492b7a3aff08a6a;p=karo-tx-linux.git

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

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

45b3160df7493d62108fc135a492b7a3aff08a6a
diff --cc drivers/i2c/busses/Kconfig
index c4a848a14188,cf474b2df4ae..a3725de92384
--- a/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/lguest/Kconfig
index 6cdcdb0d3d58,f9c43145a611..89875ea19ade
--- a/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/net/can/Kconfig
index 1cca19f1c490,72df3a306a08..9862b2e07644
--- a/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/wan/Kconfig
index 13daec88d918,61eb8994b34f..94e234975c61
--- a/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 sound/soc/codecs/Kconfig
index 133025fbb6d4,298822c0ad65..45b72561c615
--- a/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