diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/net/sky2.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/sky2.c')
| -rw-r--r-- | drivers/net/sky2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 68515150ff3b..5a5289b7a885 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
| @@ -2364,7 +2364,7 @@ static int sky2_poll(struct net_device *dev0, int *budget) | |||
| 2364 | } | 2364 | } |
| 2365 | } | 2365 | } |
| 2366 | 2366 | ||
| 2367 | static irqreturn_t sky2_intr(int irq, void *dev_id, struct pt_regs *regs) | 2367 | static irqreturn_t sky2_intr(int irq, void *dev_id) |
| 2368 | { | 2368 | { |
| 2369 | struct sky2_hw *hw = dev_id; | 2369 | struct sky2_hw *hw = dev_id; |
| 2370 | struct net_device *dev0 = hw->dev[0]; | 2370 | struct net_device *dev0 = hw->dev[0]; |
| @@ -3298,8 +3298,7 @@ static void __devinit sky2_show_addr(struct net_device *dev) | |||
| 3298 | } | 3298 | } |
| 3299 | 3299 | ||
| 3300 | /* Handle software interrupt used during MSI test */ | 3300 | /* Handle software interrupt used during MSI test */ |
| 3301 | static irqreturn_t __devinit sky2_test_intr(int irq, void *dev_id, | 3301 | static irqreturn_t __devinit sky2_test_intr(int irq, void *dev_id) |
| 3302 | struct pt_regs *regs) | ||
| 3303 | { | 3302 | { |
| 3304 | struct sky2_hw *hw = dev_id; | 3303 | struct sky2_hw *hw = dev_id; |
| 3305 | u32 status = sky2_read32(hw, B0_Y2_SP_ISRC2); | 3304 | u32 status = sky2_read32(hw, B0_Y2_SP_ISRC2); |