mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Conflicts: arch/arm/Makefile
This commit is contained in:
commit
b93a4afcff
123 changed files with 7603 additions and 3235 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue