lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable

Browse Source 
Conflicts:
	arch/arm/Makefile
This commit is contained in:
Russell King
2010-03-02 23:29:32 +00:00
parent 62c132a800 9b1489e989
commit b93a4afcff
123 changed files with 7597 additions and 3229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/serial/imx.c
View File

@ -440,7 +440,7 @@ static irqreturn_t imx_rxint(int irq, void *dev_id)
temp = readl(sport->port.membase + USR2);
if (temp & USR2_BRCD) {
writel(temp | USR2_BRCD, sport->port.membase + USR2);
writel(USR2_BRCD, sport->port.membase + USR2);
if (uart_handle_break(&sport->port))
continue;
}