diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/net/atl1c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
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 1372e9a99f5b..96506eacc131 100644 --- a/drivers/net/atl1c/atl1c_main.c +++ b/drivers/net/atl1c/atl1c_main.c | |||
| @@ -1543,7 +1543,7 @@ static irqreturn_t atl1c_intr(int irq, void *data) | |||
| 1543 | if (status & ISR_OVER) | 1543 | if (status & ISR_OVER) |
| 1544 | if (netif_msg_intr(adapter)) | 1544 | if (netif_msg_intr(adapter)) |
| 1545 | dev_warn(&pdev->dev, | 1545 | dev_warn(&pdev->dev, |
| 1546 | "TX/RX over flow (status = 0x%x)\n", | 1546 | "TX/RX overflow (status = 0x%x)\n", |
| 1547 | status & ISR_OVER); | 1547 | status & ISR_OVER); |
| 1548 | 1548 | ||
| 1549 | /* link event */ | 1549 | /* link event */ |