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/mipsnet.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/mipsnet.c')
| -rw-r--r-- | drivers/net/mipsnet.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/mipsnet.c b/drivers/net/mipsnet.c index 07e58f4a2916..c9469985bd71 100644 --- a/drivers/net/mipsnet.c +++ b/drivers/net/mipsnet.c | |||
| @@ -116,8 +116,7 @@ static inline ssize_t mipsnet_get_fromdev(struct net_device *dev, size_t count) | |||
| 116 | return count; | 116 | return count; |
| 117 | } | 117 | } |
| 118 | 118 | ||
| 119 | static irqreturn_t | 119 | static irqreturn_t mipsnet_interrupt(int irq, void *dev_id) |
| 120 | mipsnet_interrupt(int irq, void *dev_id, struct pt_regs *regs) | ||
| 121 | { | 120 | { |
| 122 | struct net_device *dev = dev_id; | 121 | struct net_device *dev = dev_id; |
| 123 | 122 | ||