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/rrunner.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/rrunner.c')
| -rw-r--r-- | drivers/net/rrunner.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c index 6108bac8d56a..d81536f90df6 100644 --- a/drivers/net/rrunner.c +++ b/drivers/net/rrunner.c | |||
| @@ -1053,7 +1053,7 @@ static void rx_int(struct net_device *dev, u32 rxlimit, u32 index) | |||
| 1053 | } | 1053 | } |
| 1054 | 1054 | ||
| 1055 | 1055 | ||
| 1056 | static irqreturn_t rr_interrupt(int irq, void *dev_id, struct pt_regs *ptregs) | 1056 | static irqreturn_t rr_interrupt(int irq, void *dev_id) |
| 1057 | { | 1057 | { |
| 1058 | struct rr_private *rrpriv; | 1058 | struct rr_private *rrpriv; |
| 1059 | struct rr_regs __iomem *regs; | 1059 | struct rr_regs __iomem *regs; |