diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/net/sunbmac.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/sunbmac.c')
| -rw-r--r-- | drivers/net/sunbmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c index 9e4be86495a0..6439b0cef1e4 100644 --- a/drivers/net/sunbmac.c +++ b/drivers/net/sunbmac.c | |||
| @@ -888,7 +888,7 @@ static void bigmac_rx(struct bigmac *bp) | |||
| 888 | printk(KERN_NOTICE "%s: Memory squeeze, deferring packet.\n", bp->dev->name); | 888 | printk(KERN_NOTICE "%s: Memory squeeze, deferring packet.\n", bp->dev->name); |
| 889 | } | 889 | } |
| 890 | 890 | ||
| 891 | static irqreturn_t bigmac_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 891 | static irqreturn_t bigmac_interrupt(int irq, void *dev_id) |
| 892 | { | 892 | { |
| 893 | struct bigmac *bp = (struct bigmac *) dev_id; | 893 | struct bigmac *bp = (struct bigmac *) dev_id; |
| 894 | u32 qec_status, bmac_status; | 894 | u32 qec_status, bmac_status; |