From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 8 Nov 2012 03:20:39 +0000 (+1100)
Subject: Merge remote-tracking branch 'tty/tty-next'
X-Git-Tag: next-20121108~25
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=af8dc2a38fa4e0e75a30ad8b99ec1ca4dd87acde;p=karo-tx-linux.git

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

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

af8dc2a38fa4e0e75a30ad8b99ec1ca4dd87acde
diff --cc drivers/tty/serial/omap-serial.c
index 4dbbc00c8266,c34735cf6276..d456321c685c
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@@ -148,9 -96,10 +148,9 @@@ struct uart_omap_port 
  	unsigned char		msr_saved_flags;
  	char			name[20];
  	unsigned long		port_activity;
- 	u32			context_loss_cnt;
+ 	int			context_loss_cnt;
  	u32			errata;
  	u8			wakeups_enabled;
 -	unsigned int		irq_pending:1;
  
  	int			DTR_gpio;
  	int			DTR_inverted;