diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 20:12:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 20:12:17 -0500 |
| commit | 501706565b2d4d2d40d0d301d5411ede099b8a6f (patch) | |
| tree | 142a18bf1f1e74a09dbfa27540b893ade0fd797d /drivers/net/atl1c | |
| parent | e93737b0f0159a61772894943199fd3b6f315641 (diff) | |
| parent | 2fe77b81c77eed92c4c0439f74c8148a295b4a86 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/net/tcp.h
Diffstat (limited to 'drivers/net/atl1c')
| -rw-r--r-- | drivers/net/atl1c/atl1c_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c index 666261b5851e..2f4be59b9c0b 100644 --- a/drivers/net/atl1c/atl1c_main.c +++ b/drivers/net/atl1c/atl1c_main.c | |||
| @@ -1541,7 +1541,7 @@ static irqreturn_t atl1c_intr(int irq, void *data) | |||
| 1541 | if (status & ISR_OVER) | 1541 | if (status & ISR_OVER) |
| 1542 | if (netif_msg_intr(adapter)) | 1542 | if (netif_msg_intr(adapter)) |
| 1543 | dev_warn(&pdev->dev, | 1543 | dev_warn(&pdev->dev, |
| 1544 | "TX/RX over flow (status = 0x%x)\n", | 1544 | "TX/RX overflow (status = 0x%x)\n", |
| 1545 | status & ISR_OVER); | 1545 | status & ISR_OVER); |
| 1546 | 1546 | ||
| 1547 | /* link event */ | 1547 | /* link event */ |