Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[safe/jmp/linux-2.6] / drivers / net / atl1c / atl1c_main.c

diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c
index 1e2f57d..6eb9241 100644 (file)
--- a/drivers/net/atl1c/atl1c_main.c
+++ b/drivers/net/atl1c/atl1c_main.c
@@ -1540,7 +1540,7 @@ static irqreturn_t atl1c_intr(int irq, void *data)
                if (status & ISR_OVER)
                        if (netif_msg_intr(adapter))
                                dev_warn(&pdev->dev,
-                                       "TX/RX over flow (status = 0x%x)\n",
+                                       "TX/RX overflow (status = 0x%x)\n",
                                        status & ISR_OVER);
 
                /* link event */