Merge 3.8-rc5 into tty-next
Greg Kroah-Hartman [Fri, 25 Jan 2013 21:27:36 +0000 (13:27 -0800)]
This resolves a number of tty driver merge issues found in linux-next

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

18 files changed:
1  2 
drivers/s390/char/con3215.c
drivers/staging/fwserial/Kconfig
drivers/staging/fwserial/fwserial.c
drivers/staging/sb105x/Kconfig
drivers/tty/pty.c
drivers/tty/serial/8250/8250.c
drivers/tty/serial/8250/8250.h
drivers/tty/serial/8250/8250_dw.c
drivers/tty/serial/8250/8250_pci.c
drivers/tty/serial/ifx6x60.c
drivers/tty/serial/mxs-auart.c
drivers/tty/serial/samsung.c
drivers/tty/serial/vt8500_serial.c
drivers/usb/class/cdc-acm.c
drivers/usb/gadget/u_serial.c
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/io_ti.c
include/uapi/linux/serial_core.h

Simple merge
@@@ -1,9 -1,11 +1,11 @@@
  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.
+         connectivity to cabled peers. This driver implements a
+         ad-hoc transport protocol and is currently limited to
+         Linux-to-Linux communication.
  
          To compile this driver as a module, say M here:  the module will
          be called firewire-serial.
Simple merge
@@@ -1,7 -1,8 +1,7 @@@
  config SB105X
        tristate "SystemBase PCI Multiport UART"
        select SERIAL_CORE
-       depends on PCI && TTY && BROKEN
 -      depends on PCI
 -      depends on X86
++      depends on PCI && X86 && TTY && BROKEN
        help
          A driver for the SystemBase Multi-2/PCI serial card
  
Simple merge
Simple merge
Simple merge
@@@ -104,8 -78,8 +104,8 @@@ static int dw8250_handle_irq(struct uar
                return 1;
        } else if ((iir & UART_IIR_BUSY) == UART_IIR_BUSY) {
                /* Clear the USR and write the LCR again. */
 -              (void)p->serial_in(p, UART_USR);
 +              (void)p->serial_in(p, DW_UART_USR);
-               p->serial_out(p, d->last_lcr, UART_LCR);
+               p->serial_out(p, UART_LCR, d->last_lcr);
  
                return 1;
        }
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge