diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-28 23:43:00 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-28 23:43:00 +0400 |
| commit | 4205e6ef4ee747aa81930537b6035086ba5f1e28 (patch) | |
| tree | b2ebe2b4621f5f531f283cb9bf0005cd3c04ca7b /arch/mips | |
| parent | cef401de7be8c4e155c6746bfccf721a4fa5fab9 (diff) | |
| parent | 9ebea3829fac7505e0cd2642fbd13cfa9c038831 (diff) | |
| download | linux-4205e6ef4ee747aa81930537b6035086ba5f1e28.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/bcm47xx/serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/bcm47xx/serial.c b/arch/mips/bcm47xx/serial.c index 57981e4fe2bc..b8ef965705cf 100644 --- a/arch/mips/bcm47xx/serial.c +++ b/arch/mips/bcm47xx/serial.c @@ -62,7 +62,7 @@ static int __init uart8250_init_bcma(void) p->mapbase = (unsigned int) bcma_port->regs; p->membase = (void *) bcma_port->regs; - p->irq = bcma_port->irq + 2; + p->irq = bcma_port->irq; p->uartclk = bcma_port->baud_base; p->regshift = bcma_port->reg_shift; p->iotype = UPIO_MEM; |