Subject: linux-next: manual merge of the tty tree with the tty.current tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 19 Apr 2012 14:59:51 +1000

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/pch_uart.c between commit af6d17cdc8c8 ("pch_uart: Fix
dma channel unallocated issue") from the tty.current tree and commit
44db113212d8 ("pch_uart: Delete unused structure member") from the tty
tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/tty/serial/pch_uart.c
index c2816f4,a5e6343..0000000
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@@ -1447,11 -1455,8 +1455,10 @@@ static int pch_uart_verify_port(struct 
  			__func__);
  		return -EOPNOTSUPP;
  #endif
- 		priv->use_dma_flag = 1;
 -		priv->use_dma = 1;
  		dev_info(priv->port.dev, "PCH UART : Use DMA Mode\n");
 +		if (!priv->use_dma)
 +			pch_request_dma(port);
 +		priv->use_dma = 1;
  	}
  
  	return 0;