From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 26 Sep 2012 04:23:13 +0000 (+1000)
Subject: Merge remote-tracking branch 'tty/tty-next'
X-Git-Tag: next-20120926~23
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=df1037db56f34a91477025c10e421a626c4400ce;p=karo-tx-linux.git

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

Conflicts:
	drivers/tty/serial/omap-serial.c
---

df1037db56f34a91477025c10e421a626c4400ce
diff --cc drivers/tty/serial/omap-serial.c
index 0952d71bdf28,3c05c5ecdfbf..44fea64bb55b
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@@ -1203,10 -1222,8 +1222,8 @@@ static int serial_omap_suspend(struct d
  {
  	struct uart_omap_port *up = dev_get_drvdata(dev);
  
- 	if (up) {
- 		uart_suspend_port(&serial_omap_reg, &up->port);
- 		flush_work(&up->qos_work);
- 	}
+ 	uart_suspend_port(&serial_omap_reg, &up->port);
 -	flush_work_sync(&up->qos_work);
++	flush_work(&up->qos_work);
  
  	return 0;
  }
diff --cc firmware/Makefile
index 76628e32fed6,fdc9ff045ef8..eeb14030d8a2
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@@ -40,9 -40,9 +40,8 @@@ fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-
  			     bnx2/bnx2-mips-06-6.2.1.fw \
  			     bnx2/bnx2-rv2p-06-6.0.15.fw
  fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
- fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin
  fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
  				   cxgb3/t3c_psram-1.1.0.bin \
 -				   cxgb3/t3fw-7.10.0.bin \
  				   cxgb3/ael2005_opt_edc.bin \
  				   cxgb3/ael2005_twx_edc.bin \
  				   cxgb3/ael2020_twx_edc.bin