diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 18:29:32 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 18:29:32 -0500 |
| commit | b93a4afcff7be859e30cad2a305731516057d6cf (patch) | |
| tree | fb5fe55864e16527e453efd18790a34db22ee2a1 /drivers/serial/imx.c | |
| parent | 62c132a8008991530839401674ce8e1b12b005d3 (diff) | |
| parent | 9b1489e989695c4d502865f8bec616c0f17e99ab (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'drivers/serial/imx.c')
| -rw-r--r-- | drivers/serial/imx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index 60d665a17a88..b801f5ab2b7b 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c | |||
| @@ -440,7 +440,7 @@ static irqreturn_t imx_rxint(int irq, void *dev_id) | |||
| 440 | 440 | ||
| 441 | temp = readl(sport->port.membase + USR2); | 441 | temp = readl(sport->port.membase + USR2); |
| 442 | if (temp & USR2_BRCD) { | 442 | if (temp & USR2_BRCD) { |
| 443 | writel(temp | USR2_BRCD, sport->port.membase + USR2); | 443 | writel(USR2_BRCD, sport->port.membase + USR2); |
| 444 | if (uart_handle_break(&sport->port)) | 444 | if (uart_handle_break(&sport->port)) |
| 445 | continue; | 445 | continue; |
| 446 | } | 446 | } |