Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

[~andy/linux] / drivers / net / irda / nsc-ircc.c

diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index b56636da6cc3b2f9b3fcea751ca17a925a9f408b..2a4f2f153244fd86e3991a290cd98a2cbaefd3da 100644 (file)
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -1664,7 +1664,7 @@ static int nsc_ircc_dma_xmit_complete(struct nsc_ircc_cb *self)
        switch_bank(iobase, BANK0);
         outb(inb(iobase+MCR) & ~MCR_DMA_EN, iobase+MCR);
        
-       /* Check for underrrun! */
+       /* Check for underrun! */
        if (inb(iobase+ASCR) & ASCR_TXUR) {
                self->netdev->stats.tx_errors++;
                self->netdev->stats.tx_fifo_errors++;