]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 02:04:35 +0000 (12:04 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 02:04:41 +0000 (12:04 +1000)
1  2 
drivers/net/ethernet/sgi/ioc3-eth.c
drivers/staging/ipack/devices/Kconfig
drivers/staging/serqt_usb2/Kconfig
drivers/tty/serial/amba-pl011.c
drivers/tty/serial/imx.c
drivers/usb/serial/console.c
include/linux/Kbuild
net/bluetooth/rfcomm/tty.c

Simple merge
index 39f71888a584059a474ec1eb61f56f19d8f2f192,39f71888a584059a474ec1eb61f56f19d8f2f192..8d69ce3ac7728257ca9d2cb95bd79eea0bde7d4c
@@@ -1,6 -1,6 +1,7 @@@
  config SERIAL_IPOCTAL
        tristate "IndustryPack IP-OCTAL uart support"
        depends on IPACK_BUS
++      depends on BROKEN
        help
          This driver supports the IPOCTAL serial port device for the IndustryPack bus.
        default n
index f4fed40e23ddf582874d26838e5b3468eb809172,f4fed40e23ddf582874d26838e5b3468eb809172..dc624a4567a203811a7ca66ad662a116296e65a2
@@@ -1,6 -1,6 +1,7 @@@
  config USB_SERIAL_QUATECH2
        tristate "USB Quatech ESU-100 8 Port Serial Driver"
        depends on USB_SERIAL
++      depends on BROKEN
        help
          Say Y here if you want to use the Quatech ESU-100 8 port usb to
          serial adapter.
Simple merge
Simple merge
index b9cca6dcde07a8f341f198ef694bf76adce24f32,b9cca6dcde07a8f341f198ef694bf76adce24f32..9a564286bfd75db516d117f30921e2730eab4529
@@@ -165,8 -165,8 +165,8 @@@ static int usb_console_setup(struct con
                }
  
                if (serial->type->set_termios) {
--                      tty->termios->c_cflag = cflag;
--                      tty_termios_encode_baud_rate(tty->termios, baud, baud);
++                      tty->termios.c_cflag = cflag;
++                      tty_termios_encode_baud_rate(&tty->termios, baud, baud);
                        memset(&dummy, 0, sizeof(struct ktermios));
                        serial->type->set_termios(tty, port, &dummy);
  
Simple merge
Simple merge