From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 25 Jan 2013 21:27:36 +0000 (-0800)
Subject: Merge 3.8-rc5 into tty-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9f9cba810f36d16f4e64477e879a69f6c47b389d;p=linux-beck.git

Merge 3.8-rc5 into tty-next

This resolves a number of tty driver merge issues found in linux-next

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

9f9cba810f36d16f4e64477e879a69f6c47b389d
diff --cc drivers/staging/fwserial/Kconfig
index 9cdb3cdc4b66,b2f8331e4acf..a0812d99136f
--- a/drivers/staging/fwserial/Kconfig
+++ b/drivers/staging/fwserial/Kconfig
@@@ -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.
diff --cc drivers/staging/sb105x/Kconfig
index 6a2e1b78e844,1facad625554..245e7847a354
--- a/drivers/staging/sb105x/Kconfig
+++ b/drivers/staging/sb105x/Kconfig
@@@ -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
  
diff --cc drivers/tty/serial/8250/8250_dw.c
index 117bb8b03598,096d2ef48b32..db0e66f6dd0e
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@@ -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;
  	}