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/3c505.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
| download | kernel_samsung_smdk4412-4ad99f15c6a3cadf36928c399459ea4fdb3d49f9.zip kernel_samsung_smdk4412-4ad99f15c6a3cadf36928c399459ea4fdb3d49f9.tar.gz kernel_samsung_smdk4412-4ad99f15c6a3cadf36928c399459ea4fdb3d49f9.tar.bz2 | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/3c505.c')
| -rw-r--r-- | drivers/net/3c505.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c index ab8230a..458cb9c 100644 --- a/drivers/net/3c505.c +++ b/drivers/net/3c505.c @@ -649,7 +649,7 @@ static void receive_packet(struct net_device *dev, int len) * ******************************************************/ -static irqreturn_t elp_interrupt(int irq, void *dev_id, struct pt_regs *reg_ptr) +static irqreturn_t elp_interrupt(int irq, void *dev_id) { int len; int dlen; |