From: Linus Torvalds Date: Thu, 21 Feb 2013 21:41:04 +0000 (-0800) Subject: Merge tag 'tty-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty X-Git-Tag: v3.9-rc1~125 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21eaab6d19ed43e82ed39c8deb7f192134fb4a0e;p=pandora-kernel.git Merge tag 'tty-3.9-rc1' of git://git./linux/kernel/git/gregkh/tty Pull tty/serial patches from Greg Kroah-Hartman: "Here's the big tty/serial driver patches for 3.9-rc1. More tty port rework and fixes from Jiri here, as well as lots of individual serial driver updates and fixes. All of these have been in the linux-next tree for a while." * tag 'tty-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (140 commits) tty: mxser: improve error handling in mxser_probe() and mxser_module_init() serial: imx: fix uninitialized variable warning serial: tegra: assume CONFIG_OF TTY: do not update atime/mtime on read/write lguest: select CONFIG_TTY to build properly. ARM defconfigs: add missing inclusions of linux/platform_device.h fb/exynos: include platform_device.h ARM: sa1100/assabet: include platform_device.h directly serial: imx: Fix recursive locking bug pps: Fix build breakage from decoupling pps from tty tty: Remove ancient hardpps() pps: Additional cleanups in uart_handle_dcd_change pps: Move timestamp read into PPS code proper pps: Don't crash the machine when exiting will do pps: Fix a use-after free bug when unregistering a source. pps: Use pps_lookup_dev to reduce ldisc coupling pps: Add pps_lookup_dev() function tty: serial: uartlite: Support uartlite on big and little endian systems tty: serial: uartlite: Fix sparse and checkpatch warnings serial/arc-uart: Miscll DT related updates (Grant's review comments) ... Fix up trivial conflicts, mostly just due to the TTY config option clashing with the EXPERIMENTAL removal. --- 21eaab6d19ed43e82ed39c8deb7f192134fb4a0e diff --cc drivers/i2c/busses/Kconfig index 9b94a78ca776,cf474b2df4ae..8bb810e1900b --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@@ -802,6 -803,7 +802,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 drivers/usb/gadget/Kconfig index c5c6fa60910d,a1bd951f9cb7..5a0c541daf89 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@@ -762,8 -750,7 +762,9 @@@ config USB_GADGET_TARGE config USB_G_SERIAL tristate "Serial Gadget (with CDC ACM and CDC OBEX support)" + depends on TTY + select USB_U_SERIAL + select USB_F_ACM select USB_LIBCOMPOSITE help The Serial Gadget talks to the Linux-USB generic serial driver. 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